summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-01 13:10:59 +0100
committerStefan Metzmacher <metze@samba.org>2008-06-10 11:36:39 +0200
commita7967bc84ce6e5177659060c8c2baf120d9686a2 (patch)
treeb2cfa07a16aec343898a69799a310268dd71a10c
parent9b7b444e35493100df2258dc78db59f0f6237d0d (diff)
downloadsamba-a7967bc84ce6e5177659060c8c2baf120d9686a2.tar.gz
samba-a7967bc84ce6e5177659060c8c2baf120d9686a2.tar.bz2
samba-a7967bc84ce6e5177659060c8c2baf120d9686a2.zip
r25783: socket_wrapper: don't include "includes.h"
metze (cherry picked from commit 47f865165e772540334dcbcf80cfc1999b0132fa) (This used to be commit 4d5bfcc731b44267e2c30fccdca72b6058b16bfb)
-rw-r--r--source3/lib/socket_wrapper/socket_wrapper.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/source3/lib/socket_wrapper/socket_wrapper.c b/source3/lib/socket_wrapper/socket_wrapper.c
index 2ad6a2e9e5..f433b0e41f 100644
--- 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 { \