diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
| commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
| tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source4/lib/socket | |
| parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
| parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
| download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source4/lib/socket')
| -rw-r--r-- | source4/lib/socket/interface.c | 2 | ||||
| -rw-r--r-- | source4/lib/socket/socket.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/socket/interface.c b/source4/lib/socket/interface.c index c327f02bbd..b4e7c2bf32 100644 --- a/source4/lib/socket/interface.c +++ b/source4/lib/socket/interface.c @@ -22,7 +22,7 @@ #include "includes.h" #include "system/network.h" #include "lib/socket/netif.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" /** used for network interfaces */ diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c index 92f0a44005..0c3d032068 100644 --- a/source4/lib/socket/socket.c +++ b/source4/lib/socket/socket.c @@ -491,7 +491,7 @@ static const struct { **/ _PUBLIC_ void set_socket_options(int fd, const char *options) { - const char **options_list = str_list_make(NULL, options, " \t,"); + const char **options_list = (const char **)str_list_make(NULL, options, " \t,"); int j; if (!options_list) |