summaryrefslogtreecommitdiffstats
path: root/source/lib
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-13 10:13:01 +0000
committerStefan Metzmacher <metze@samba.org>2006-09-13 10:13:01 +0000
commit4e014f8bf208cdf209553666aaad7a5ce05ece97 (patch)
tree3a30e1ccabd7712121744cb381906fcb44f539f1 /source/lib
parent996837eabcb9231a9bf9ee2cef5fb23935c45404 (diff)
downloadsamba-4e014f8bf208cdf209553666aaad7a5ce05ece97.tar.gz
samba-4e014f8bf208cdf209553666aaad7a5ce05ece97.tar.xz
samba-4e014f8bf208cdf209553666aaad7a5ce05ece97.zip
r18458: move wins32 stuff to the top dir
metze
Diffstat (limited to 'source/lib')
-rw-r--r--source/lib/replace/libreplace.m45
-rw-r--r--source/lib/replace/replace.h2
-rw-r--r--source/lib/replace/win32.m4 (renamed from source/lib/replace/win32/config.m4)0
-rw-r--r--source/lib/replace/win32_replace.h (renamed from source/lib/replace/win32/replace.h)0
4 files changed, 4 insertions, 3 deletions
diff --git a/source/lib/replace/libreplace.m4 b/source/lib/replace/libreplace.m4
index febee6409e4..3a40b39da2f 100644
--- a/source/lib/replace/libreplace.m4
+++ b/source/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/source/lib/replace/replace.h b/source/lib/replace/replace.h
index a7ad58dd563..e35f1da44e3 100644
--- a/source/lib/replace/replace.h
+++ b/source/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/source/lib/replace/win32/config.m4 b/source/lib/replace/win32.m4
index 9ac84cdf2ad..9ac84cdf2ad 100644
--- a/source/lib/replace/win32/config.m4
+++ b/source/lib/replace/win32.m4
diff --git a/source/lib/replace/win32/replace.h b/source/lib/replace/win32_replace.h
index 9901e72f6ef..9901e72f6ef 100644
--- a/source/lib/replace/win32/replace.h
+++ b/source/lib/replace/win32_replace.h