From e8e94a93b554d357c577850c4abf85d942333bec Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Nov 2004 12:43:25 +0000 Subject: r3482: fixed a warning and an error from the IRIX 6.4 build (This used to be commit 8ec3cf8b2ba149b7d6a15689e9b77685c6da3179) --- source4/lib/iconv.c | 2 +- source4/lib/socket/socket_unix.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/lib') 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" -- cgit