diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-02 12:43:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:20 -0500 |
| commit | e8e94a93b554d357c577850c4abf85d942333bec (patch) | |
| tree | 0d9d78816d104acc3ea8362fbdfffc842eee01b7 /source4 | |
| parent | a99b6219a810a1cd10bd62a6716780602808f0cd (diff) | |
| download | samba-e8e94a93b554d357c577850c4abf85d942333bec.tar.gz samba-e8e94a93b554d357c577850c4abf85d942333bec.tar.bz2 samba-e8e94a93b554d357c577850c4abf85d942333bec.zip | |
r3482: fixed a warning and an error from the IRIX 6.4 build
(This used to be commit 8ec3cf8b2ba149b7d6a15689e9b77685c6da3179)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/iconv.c | 2 | ||||
| -rw-r--r-- | source4/lib/socket/socket_unix.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/iconv.c b/source4/lib/iconv.c index c4fea25db5..a08e0ee69a 100644 --- a/source4/lib/iconv.c +++ b/source4/lib/iconv.c @@ -56,7 +56,7 @@ static size_t ucs2hex_push(void *,const char **, size_t *, char **, size_t *); static size_t iconv_copy (void *,const char **, size_t *, char **, size_t *); static size_t iconv_swab (void *,const char **, size_t *, char **, size_t *); -static const struct charset_functions const builtin_functions[] = { +static const struct charset_functions builtin_functions[] = { /* windows is closest to UTF-16 */ {"UCS-2LE", iconv_copy, iconv_copy}, {"UTF-16LE", iconv_copy, iconv_copy}, diff --git a/source4/lib/socket/socket_unix.c b/source4/lib/socket/socket_unix.c index f09573802a..0ba4797219 100644 --- a/source4/lib/socket/socket_unix.c +++ b/source4/lib/socket/socket_unix.c @@ -22,6 +22,7 @@ */ #include "includes.h" +#include "system/network.h" |