git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b869a08
)
r25783: socket_wrapper: don't include "includes.h"
author
Stefan Metzmacher
<metze@samba.org>
Thu, 1 Nov 2007 12:10:59 +0000
(13:10 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Fri, 21 Dec 2007 04:43:57 +0000
(
05:43
+0100)
metze
(This used to be commit
47f865165e772540334dcbcf80cfc1999b0132fa
)
source4/lib/socket_wrapper/socket_wrapper.c
patch
|
blob
|
history
diff --git
a/source4/lib/socket_wrapper/socket_wrapper.c
b/source4/lib/socket_wrapper/socket_wrapper.c
index c13cb6a3b08ef05b54987cb2b71ed89b5af1edf1..574d8ec5e4ffdacd2fe05e808879f5144647824c 100644
(file)
--- 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 { \