summaryrefslogtreecommitdiff
path: root/source4/lib/socket_wrapper/socket_wrapper.c
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib/socket_wrapper/socket_wrapper.c')
-rw-r--r--source4/lib/socket_wrapper/socket_wrapper.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/source4/lib/socket_wrapper/socket_wrapper.c b/source4/lib/socket_wrapper/socket_wrapper.c
index c13cb6a3b0..574d8ec5e4 100644
--- a/source4/lib/socket_wrapper/socket_wrapper.c
+++ b/source4/lib/socket_wrapper/socket_wrapper.c
@@ -42,19 +42,10 @@
#ifdef _SAMBA_BUILD_
#define SOCKET_WRAPPER_NOT_REPLACE
-#include "includes.h"
+#include "lib/replace/replace.h"
#include "system/network.h"
#include "system/filesys.h"
-
-#ifdef malloc
-#undef malloc
-#endif
-#ifdef calloc
-#undef calloc
-#endif
-#ifdef strdup
-#undef strdup
-#endif
+#include "system/time.h"
#else /* _SAMBA_BUILD_ */
@@ -74,8 +65,10 @@
#include <string.h>
#include <stdio.h>
-#define _PUBLIC_
+#endif
+#ifndef _PUBLIC_
+#define _PUBLIC_
#endif
#define SWRAP_DLIST_ADD(list,item) do { \