r25783: socket_wrapper: don't include "includes.h"

metze
(cherry picked from commit 47f865165e772540334dcbcf80cfc1999b0132fa)
(This used to be commit 4d5bfcc731b44267e2c30fccdca72b6058b16bfb)

diff --git a/source3/lib/socket_wrapper/socket_wrapper.c b/source3/lib/socket_wrapper/socket_wrapper.c
index 2ad6a2e9e5d585acd2a7fd4b15785048754fecba..f433b0e41f5be7efb7fd70ff5e101ae1fcbd5c24 100644 (file)
--- a/source3/lib/socket_wrapper/socket_wrapper.c
+++ b/source3/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_ */
 
@@ -75,8 +66,10 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#define _PUBLIC_
+#endif
 
+#ifndef _PUBLIC_
+#define _PUBLIC_
 #endif
 
 #define SWRAP_DLIST_ADD(list,item) do { \