diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-30 22:09:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:21 -0500 |
| commit | 44d7f4f23829d98b95d9153970849a9681e4ef26 (patch) | |
| tree | e1ad9250bc9a09399d84dad152da7b0c2c2702c2 /source4 | |
| parent | 2d0349614c516ce63022c50ccb71bb76d04abb1c (diff) | |
| download | samba-44d7f4f23829d98b95d9153970849a9681e4ef26.tar.gz samba-44d7f4f23829d98b95d9153970849a9681e4ef26.tar.xz samba-44d7f4f23829d98b95d9153970849a9681e4ef26.zip | |
r6139: Move socket_wrapper to a seperate directory
(This used to be commit a2ef9225f15e369af7b884262b997ab321fd24d6)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/main.pm | 1 | ||||
| -rw-r--r-- | source4/include/system/network.h | 2 | ||||
| -rw-r--r-- | source4/lib/basic.mk | 8 | ||||
| -rw-r--r-- | source4/lib/socket_wrapper/config.mk | 7 | ||||
| -rw-r--r-- | source4/lib/socket_wrapper/socket_wrapper.c (renamed from source4/lib/socket_wrapper.c) | 0 | ||||
| -rw-r--r-- | source4/lib/socket_wrapper/socket_wrapper.h (renamed from source4/lib/socket_wrapper.h) | 0 |
6 files changed, 9 insertions, 9 deletions
diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm index 1dee5be910f..e42e15b1f83 100644 --- a/source4/build/smb_build/main.pm +++ b/source4/build/smb_build/main.pm @@ -39,6 +39,7 @@ sub smb_build_main($) "lib/events/config.mk", "lib/popt/config.mk", "lib/cmdline/config.mk", + "lib/socket_wrapper/config.mk", "smb_server/config.mk", "rpc_server/config.mk", "ldap_server/config.mk", diff --git a/source4/include/system/network.h b/source4/include/system/network.h index f661194831d..832000a5df0 100644 --- a/source4/include/system/network.h +++ b/source4/include/system/network.h @@ -59,7 +59,7 @@ #ifdef DEVELOPER #define SOCKET_WRAPPER_REPLACE -#include "lib/socket_wrapper.h" +#include "lib/socket_wrapper/socket_wrapper.h" #endif #ifdef REPLACE_INET_NTOA diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index ec61a28d15d..f0b2b05b6a4 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -41,14 +41,6 @@ INIT_OBJ_FILES = \ ################################################ ############################## -# Start SUBSYSTEM SOCKET_WRAPPER -[SUBSYSTEM::SOCKET_WRAPPER] -NOPROTO = YES -INIT_OBJ_FILES = lib/socket_wrapper.o -# End SUBSYSTEM SOCKET_WRAPPER -############################## - -############################## # Start SUBSYSTEM LIBBASIC [SUBSYSTEM::LIBBASIC] INIT_OBJ_FILES = lib/version.o diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk new file mode 100644 index 00000000000..bc9a0951dcc --- /dev/null +++ b/source4/lib/socket_wrapper/config.mk @@ -0,0 +1,7 @@ +############################## +# Start SUBSYSTEM SOCKET_WRAPPER +[SUBSYSTEM::SOCKET_WRAPPER] +NOPROTO = YES +INIT_OBJ_FILES = lib/socket_wrapper/socket_wrapper.o +# End SUBSYSTEM SOCKET_WRAPPER +############################## diff --git a/source4/lib/socket_wrapper.c b/source4/lib/socket_wrapper/socket_wrapper.c index 5decde2cea1..5decde2cea1 100644 --- a/source4/lib/socket_wrapper.c +++ b/source4/lib/socket_wrapper/socket_wrapper.c diff --git a/source4/lib/socket_wrapper.h b/source4/lib/socket_wrapper/socket_wrapper.h index 6da5a2980cd..6da5a2980cd 100644 --- a/source4/lib/socket_wrapper.h +++ b/source4/lib/socket_wrapper/socket_wrapper.h |