summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>2000-01-30 01:44:41 +0000
committerLuke Leighton <lkcl@samba.org>2000-01-30 01:44:41 +0000
commit85910c97dcefabe2bc310f17c9a4fe9bd6926d45 (patch)
tree50a909948e5e8d7e14ca8a37420246e2a53b8a96 /source
parentc05943d7f1a59f297bb507a43e628332e61f04e5 (diff)
downloadsamba-85910c97dcefabe2bc310f17c9a4fe9bd6926d45.tar.gz
samba-85910c97dcefabe2bc310f17c9a4fe9bd6926d45.tar.xz
samba-85910c97dcefabe2bc310f17c9a4fe9bd6926d45.zip
patch from Elrond to include/exclude nterr.h as needed.
Diffstat (limited to 'source')
-rw-r--r--source/include/includes.h2
-rw-r--r--source/libsmb/clientgen.c1
-rw-r--r--source/printing/printing.c2
-rw-r--r--source/rpc_client/cli_lsarpc.c1
-rw-r--r--source/rpc_client/cli_netlogon.c1
-rw-r--r--source/rpc_client/cli_spoolss.c1
-rw-r--r--source/rpc_client/msrpc_netlogon.c1
-rw-r--r--source/rpc_parse/parse_samr.c1
-rw-r--r--source/smbd/blocking.c2
-rw-r--r--source/smbd/trans2.c1
10 files changed, 11 insertions, 2 deletions
diff --git a/source/include/includes.h b/source/include/includes.h
index 2d47b15edcc..d66c5956cc0 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -571,8 +571,6 @@ extern int errno;
#include "kanji.h"
#include "charset.h"
-#include "nterr.h"
-
#ifdef WITH_PROFILE
#include "profile.h"
#endif
diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c
index 22a6fec1247..bc6e2c05d73 100644
--- a/source/libsmb/clientgen.c
+++ b/source/libsmb/clientgen.c
@@ -23,6 +23,7 @@
#define NO_SYSLOG
#include "includes.h"
+#include "nterr.h"
#include "trans2.h"
extern int DEBUGLEVEL;
diff --git a/source/printing/printing.c b/source/printing/printing.c
index 20840f16dbe..3ccfc0fb4a5 100644
--- a/source/printing/printing.c
+++ b/source/printing/printing.c
@@ -20,6 +20,8 @@
*/
#include "includes.h"
+#include "nterr.h"
+
extern int DEBUGLEVEL;
static BOOL * lpq_cache_reset=NULL;
diff --git a/source/rpc_client/cli_lsarpc.c b/source/rpc_client/cli_lsarpc.c
index fa05325990a..dedd9a6f867 100644
--- a/source/rpc_client/cli_lsarpc.c
+++ b/source/rpc_client/cli_lsarpc.c
@@ -28,6 +28,7 @@
#endif
#include "includes.h"
+#include "nterr.h"
extern int DEBUGLEVEL;
diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index 569a49e7e92..729caefe094 100644
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/rpc_client/cli_netlogon.c
@@ -28,6 +28,7 @@
#endif
#include "includes.h"
+#include "nterr.h"
extern int DEBUGLEVEL;
diff --git a/source/rpc_client/cli_spoolss.c b/source/rpc_client/cli_spoolss.c
index 255c6f4facf..b5a5d00a2b0 100644
--- a/source/rpc_client/cli_spoolss.c
+++ b/source/rpc_client/cli_spoolss.c
@@ -28,6 +28,7 @@
#endif
#include "includes.h"
+#include "nterr.h"
extern int DEBUGLEVEL;
diff --git a/source/rpc_client/msrpc_netlogon.c b/source/rpc_client/msrpc_netlogon.c
index 70d162639a1..9cbdbe2ac36 100644
--- a/source/rpc_client/msrpc_netlogon.c
+++ b/source/rpc_client/msrpc_netlogon.c
@@ -28,6 +28,7 @@
#endif
#include "includes.h"
+#include "nterr.h"
extern int DEBUGLEVEL;
extern pstring global_myname;
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index f6edc78213f..aabbafe1d72 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -23,6 +23,7 @@
#include "includes.h"
+#include "nterr.h"
extern int DEBUGLEVEL;
diff --git a/source/smbd/blocking.c b/source/smbd/blocking.c
index 32b6d010a4f..96833286e2b 100644
--- a/source/smbd/blocking.c
+++ b/source/smbd/blocking.c
@@ -20,6 +20,8 @@
*/
#include "includes.h"
+#include "nterr.h"
+
extern int DEBUGLEVEL;
extern int Client;
extern int chain_size;
diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 4e303fdd27f..1a8fdd12962 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "nterr.h"
#include "trans2.h"
extern int DEBUGLEVEL;