summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-10-11 11:52:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:20:56 -0500
commitb6582987fe25ef3d54034f2f27a052664a298f3e (patch)
treedd47adc8d2af3f5a24864e5c121fb594ec2350ae
parent5916c6c469da4d571bb7adb8d25c51a1882cf68e (diff)
downloadsamba-b6582987fe25ef3d54034f2f27a052664a298f3e.tar.gz
samba-b6582987fe25ef3d54034f2f27a052664a298f3e.tar.bz2
samba-b6582987fe25ef3d54034f2f27a052664a298f3e.zip
r19242: merge from samba3:
handle NO_CONFIG_H in libreplace metze (This used to be commit 909d736a4bf5a7adfcd64eecf6bb2a92211c6f96)
-rw-r--r--source4/include/includes.h5
-rw-r--r--source4/lib/replace/replace.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index c4ee86b3b9..a2c8b3472d 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -21,17 +21,16 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef NO_CONFIG_H /* for some tests */
#include "lib/replace/replace.h"
/* make sure we have included the correct config.h */
+#ifndef NO_CONFIG_H /* for some tests */
#ifndef CONFIG_H_IS_FROM_SAMBA
#error "make sure you have removed all config.h files from standalone builds!"
#error "the included config.h isn't from samba!"
#endif
-
#endif /* NO_CONFIG_H */
-
+
#include "local.h"
#ifdef __GNUC__
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index 8943c7d637..7a79f335e2 100644
--- a/source4/lib/replace/replace.h
+++ b/source4/lib/replace/replace.h
@@ -28,7 +28,9 @@
#ifndef _LIBREPLACE_REPLACE_H
#define _LIBREPLACE_REPLACE_H
+#ifndef NO_CONFIG_H
#include "config.h"
+#endif
#ifdef HAVE_STANDARDS_H
#include <standards.h>