diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-11-01 13:10:59 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:43:57 +0100 |
| commit | f603a0c579745c1ee910075f6a40fdd904658317 (patch) | |
| tree | b3565fe2d6680dff4e2974e84ee288da6b87a4cd /source4 | |
| parent | b869a0866199562cbe5fed85ac535506d1e18cf6 (diff) | |
| download | samba-f603a0c579745c1ee910075f6a40fdd904658317.tar.gz samba-f603a0c579745c1ee910075f6a40fdd904658317.tar.bz2 samba-f603a0c579745c1ee910075f6a40fdd904658317.zip | |
r25783: socket_wrapper: don't include "includes.h"
metze
(This used to be commit 47f865165e772540334dcbcf80cfc1999b0132fa)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/socket_wrapper/socket_wrapper.c | 17 |
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 { \ |