diff options
author | Stefan Metzmacher <metze@samba.org> | 2007-04-17 07:45:54 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:50:58 -0500 |
commit | 3eb286b52a30f126c53fd3d9688c51586f7b73ad (patch) | |
tree | 6780a61c25d1a1ecfc31ad01808fd2a7eb1f5054 /source4 | |
parent | 0ca88077341f9e75c8d1f75278fb462d1cc4f99f (diff) | |
download | samba-3eb286b52a30f126c53fd3d9688c51586f7b73ad.tar.gz samba-3eb286b52a30f126c53fd3d9688c51586f7b73ad.tar.bz2 samba-3eb286b52a30f126c53fd3d9688c51586f7b73ad.zip |
r22296: heimdal/lib/roken/roken.h.in includes <socket_wrapper.h>
which doesn't work on some hosts in the farm
so include socket_wrapper via "system/network.h" as the rest of samba4
metze
(This used to be commit 38aeb585a19e1d022a8c559cc6d08391b270785b)
Diffstat (limited to 'source4')
-rw-r--r-- | source4/heimdal_build/roken.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h index c032fc67e6..766f4555b8 100644 --- a/source4/heimdal_build/roken.h +++ b/source4/heimdal_build/roken.h @@ -73,9 +73,12 @@ #define HAVE_INNETGR #endif -#ifdef SOCKET_WRAPPER -#define SOCKET_WRAPPER_REPLACE SOCKET_WRAPPER -#endif - +/* + * we don't want that roken.h.in includes socket_wrapper + * we include socket_wrapper via "system/network.h" + */ +#undef SOCKET_WRAPPER_REPLACE #include "heimdal/lib/roken/roken.h.in" +#include "system/network.h" + #endif |