summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/replace/libreplace.m45
-rw-r--r--source4/lib/replace/replace.h2
-rw-r--r--source4/lib/replace/win32.m4 (renamed from source4/lib/replace/win32/config.m4)0
-rw-r--r--source4/lib/replace/win32_replace.h (renamed from source4/lib/replace/win32/replace.h)0
4 files changed, 4 insertions, 3 deletions
diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4
index febee6409e..3a40b39da2 100644
--- a/source4/lib/replace/libreplace.m4
+++ b/source4/lib/replace/libreplace.m4
@@ -340,9 +340,10 @@ fi
m4_include(dlfcn.m4)
m4_include(getpass.m4)
-m4_include(system/config.m4)
-m4_include(win32/config.m4)
+m4_include(win32.m4)
m4_include(repdir.m4)
+m4_include(system/config.m4)
+
AC_CHECK_FUNCS([syslog memset setnetgrent getnetgrent endnetgrent memcpy],,
[AC_MSG_ERROR([Required function not found])])
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index a7ad58dd56..e35f1da44e 100644
--- a/source4/lib/replace/replace.h
+++ b/source4/lib/replace/replace.h
@@ -40,7 +40,7 @@
#include <errno.h>
#if defined(_MSC_VER) || defined(__MINGW32__)
-#include "lib/replace/win32/replace.h"
+#include "win32_replace.h"
#endif
#ifdef __COMPAR_FN_T
diff --git a/source4/lib/replace/win32/config.m4 b/source4/lib/replace/win32.m4
index 9ac84cdf2a..9ac84cdf2a 100644
--- a/source4/lib/replace/win32/config.m4
+++ b/source4/lib/replace/win32.m4
diff --git a/source4/lib/replace/win32/replace.h b/source4/lib/replace/win32_replace.h
index 9901e72f6e..9901e72f6e 100644
--- a/source4/lib/replace/win32/replace.h
+++ b/source4/lib/replace/win32_replace.h