diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-06 05:42:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:37 -0500 |
| commit | bf5b0606a53251d47ae220d3771b953d8e4a7b22 (patch) | |
| tree | f10d116036c2a95eca6afc982f80c7dad5fa9804 | |
| parent | eaf584cd9746c2c1cc532901633b1a47a16a8836 (diff) | |
| download | samba-bf5b0606a53251d47ae220d3771b953d8e4a7b22.tar.gz samba-bf5b0606a53251d47ae220d3771b953d8e4a7b22.tar.bz2 samba-bf5b0606a53251d47ae220d3771b953d8e4a7b22.zip | |
r18134: the lib/replace/system/filesys.h in this patch should be
system/filesys.h, but it doesn't work. Metze is looking into it :-)
(This used to be commit 0dc0b7ff613d39f93c1680116c04348b720afaff)
| -rw-r--r-- | source4/lib/smbreadline/readline.m4 | 4 | ||||
| -rw-r--r-- | source4/lib/smbreadline/smbreadline.c | 6 | ||||
| -rw-r--r-- | source4/lib/socket_wrapper/config.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/smbreadline/readline.m4 b/source4/lib/smbreadline/readline.m4 index cff7ece126..e19f0a1744 100644 --- a/source4/lib/smbreadline/readline.m4 +++ b/source4/lib/smbreadline/readline.m4 @@ -72,10 +72,10 @@ AC_MSG_CHECKING(whether to use extern readline) if test x"$EXTERNAL_READLINE" = x"yes"; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline]) - SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [READLINE]) + SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [READLINE LIBREPLACE]) SMB_EXT_LIB(READLINE, [${TERMLIBS}]) SMB_ENABLE(READLINE,YES) else - SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], []) + SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [LIBREPLACE]) AC_MSG_RESULT(no) fi diff --git a/source4/lib/smbreadline/smbreadline.c b/source4/lib/smbreadline/smbreadline.c index 78febf5000..3d046f6099 100644 --- a/source4/lib/smbreadline/smbreadline.c +++ b/source4/lib/smbreadline/smbreadline.c @@ -21,9 +21,9 @@ #include "includes.h" #include "pstring.h" - -#include <unistd.h> -#include "system/readline.h" +#include "lib/replace/system/filesys.h" +#include "lib/replace/system/select.h" +#include "lib/replace/system/readline.h" /******************************************************************* Similar to sys_select() but catch EINTR and continue. diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk index 9e194230dc..9d38e75341 100644 --- a/source4/lib/socket_wrapper/config.mk +++ b/source4/lib/socket_wrapper/config.mk @@ -6,6 +6,6 @@ SO_VERSION = 0 DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets PUBLIC_HEADERS = socket_wrapper.h OBJ_FILES = socket_wrapper.o -PRIVATE_DEPENDENCIES = EXT_SOCKET +PRIVATE_DEPENDENCIES = EXT_SOCKET LIBREPLACE # End SUBSYSTEM SOCKET_WRAPPER ############################## |