r3482: fixed a warning and an error from the IRIX 6.4 build

(This used to be commit 8ec3cf8b2ba149b7d6a15689e9b77685c6da3179)

diff --git a/source4/lib/iconv.c b/source4/lib/iconv.c
index c4fea25db59893f66a76a60f1bf9b5093abf92bb..a08e0ee69a9072ef09875539dce5c03bdb3de7fb 100644 (file)
--- 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 f09573802a0144d4e47c62f5f7a95909830d54e4..0ba4797219cd4b323192b9a4479a84ce1ce7de1f 100644 (file)
--- 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"