svn commit: samba r3482 - in branches/SAMBA_4_0/source/lib: . socket

[tridge at samba.org]

Author: tridge
Date: 2004-11-02 12:43:25 +0000 (Tue, 02 Nov 2004)
New Revision: 3482

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3482

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









Modified:
   branches/SAMBA_4_0/source/lib/iconv.c
   branches/SAMBA_4_0/source/lib/socket/socket_unix.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/iconv.c
===================================================================
--- branches/SAMBA_4_0/source/lib/iconv.c	2004-11-02 12:15:17 UTC (rev 3481)
+++ branches/SAMBA_4_0/source/lib/iconv.c	2004-11-02 12:43:25 UTC (rev 3482)
@@ -56,7 +56,7 @@
 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},

Modified: branches/SAMBA_4_0/source/lib/socket/socket_unix.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/socket_unix.c	2004-11-02 12:15:17 UTC (rev 3481)
+++ branches/SAMBA_4_0/source/lib/socket/socket_unix.c	2004-11-02 12:43:25 UTC (rev 3482)
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/network.h"