summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-17 05:11:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:54 -0500
commit4a854fe809ba617336db3e1d277e00c7ef95c55f (patch)
treed1a57833acd0ba4ed43e8076cfe2cb6d3ea842a3
parent5d6a38004ad45ae58a0a064132d383d3d3ee4c99 (diff)
downloadsamba-4a854fe809ba617336db3e1d277e00c7ef95c55f.tar.gz
samba-4a854fe809ba617336db3e1d277e00c7ef95c55f.tar.bz2
samba-4a854fe809ba617336db3e1d277e00c7ef95c55f.zip
r18593: try to get the same socket_wrapper file building in samba3 and samba4
this is preparation of adding libreplace to samba3 later. metze (This used to be commit 26228e4b2e8debd84caebe84bb34bfbbf2ad405c)
-rw-r--r--source4/lib/replace/system/network.h2
-rw-r--r--source4/lib/socket_wrapper/socket_wrapper.c25
-rw-r--r--source4/lib/util/dlinklist.h5
3 files changed, 29 insertions, 3 deletions
diff --git a/source4/lib/replace/system/network.h b/source4/lib/replace/system/network.h
index 9b73466924..615fcab5c8 100644
--- a/source4/lib/replace/system/network.h
+++ b/source4/lib/replace/system/network.h
@@ -67,7 +67,9 @@
#endif
#ifdef SOCKET_WRAPPER
+#ifndef SOCKET_WRAPPER_NOT_REPLACE
#define SOCKET_WRAPPER_REPLACE
+#endif
#include "lib/socket_wrapper/socket_wrapper.h"
#endif
diff --git a/source4/lib/socket_wrapper/socket_wrapper.c b/source4/lib/socket_wrapper/socket_wrapper.c
index fe0b4dfe76..5417f70a06 100644
--- a/source4/lib/socket_wrapper/socket_wrapper.c
+++ b/source4/lib/socket_wrapper/socket_wrapper.c
@@ -21,11 +21,28 @@
*/
#ifdef _SAMBA_BUILD_
+
+#define SOCKET_WRAPPER_NOT_REPLACE
#include "includes.h"
-#undef SOCKET_WRAPPER
#include "system/network.h"
#include "system/filesys.h"
-#else
+
+#ifndef _DLINKLIST_H
+#include "lib/util/dlinklist.h"
+#endif
+
+#ifdef malloc
+#undef malloc
+#endif
+#ifdef calloc
+#undef calloc
+#endif
+#ifdef strdup
+#undef strdup
+#endif
+
+#else /* _SAMBA_BUILD_ */
+
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
@@ -37,8 +54,10 @@
#include <unistd.h>
#include <string.h>
#include <stdio.h>
+
+#error "dlinklist.h missing"
+
#endif
-#include "lib/util/dlinklist.h"
/* LD_PRELOAD doesn't work yet, so REWRITE_CALLS is all we support
* for now */
diff --git a/source4/lib/util/dlinklist.h b/source4/lib/util/dlinklist.h
index 527b211cd3..f267e77ea6 100644
--- a/source4/lib/util/dlinklist.h
+++ b/source4/lib/util/dlinklist.h
@@ -21,6 +21,9 @@
/* To use these macros you must have a structure containing a next and
prev pointer */
+#ifndef _DLINKLIST_H
+#define _DLINKLIST_H
+
/* hook into the front of the list */
#define DLIST_ADD(list, p) \
@@ -107,3 +110,5 @@ do { \
} \
} \
} while (0)
+
+#endif /* _DLINKLIST_H */