summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-07-29 03:08:05 +0000
committerAndrew Tridgell <tridge@samba.org>1998-07-29 03:08:05 +0000
commit64578c0589a3a741f81fb55c16eeb882128da00b (patch)
tree8b650156e44e4d39af8625185d857a88789b8074 /source3/utils
parentc48b3fce6be6d5d952cbcda0ddae223dda5a576f (diff)
downloadsamba-64578c0589a3a741f81fb55c16eeb882128da00b.tar.gz
samba-64578c0589a3a741f81fb55c16eeb882128da00b.tar.bz2
samba-64578c0589a3a741f81fb55c16eeb882128da00b.zip
merge from the autoconf2 branch to the main branch
(This used to be commit 3bda7ac417107a7b01d91805ca71c4330657ed21)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/nmblookup.c4
-rw-r--r--source3/utils/status.c4
-rw-r--r--source3/utils/torture.c4
3 files changed, 3 insertions, 9 deletions
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 59d5771c5d..551d453dba 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -20,9 +20,7 @@
*/
-#ifdef SYSLOG
-#undef SYSLOG
-#endif
+#define NO_SYSLOG
#include "includes.h"
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 2900d3acbe..8ece6ed4c1 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -32,9 +32,7 @@
* This program reports current SMB connections
*/
-#ifdef SYSLOG
-#undef SYSLOG
-#endif
+#define NO_SYSLOG
#include "includes.h"
diff --git a/source3/utils/torture.c b/source3/utils/torture.c
index 1abfee0541..53226d00e6 100644
--- a/source3/utils/torture.c
+++ b/source3/utils/torture.c
@@ -19,9 +19,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifdef SYSLOG
-#undef SYSLOG
-#endif
+#define NO_SYSLOG
#include "includes.h"