Author: metze Date: 2007-11-01 13:10:59 +0000 (Thu, 01 Nov 2007) New Revision: 25783
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25783 Log: socket_wrapper: don't include "includes.h" metze Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c Changeset: Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c =================================================================== --- branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c 2007-11-01 12:39:12 UTC (rev 25782) +++ branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c 2007-11-01 13:10:59 UTC (rev 25783) @@ -42,20 +42,11 @@ #ifdef _SAMBA_BUILD_ #define SOCKET_WRAPPER_NOT_REPLACE -#include "includes.h" +#include "lib/replace/replace.h" #include "system/network.h" #include "system/filesys.h" +#include "system/time.h" -#ifdef malloc -#undef malloc -#endif -#ifdef calloc -#undef calloc -#endif -#ifdef strdup -#undef strdup -#endif - #else /* _SAMBA_BUILD_ */ #include <sys/types.h> @@ -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 { \