Imported Upstream version 3.8.0

Former-commit-id: 6a76a29bd07d86e57c6c8da45c65ed5447d38a61

support/Makefile.in

@@ -282,6 +282,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GDKX11 = @GDKX11@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
@@ -290,6 +291,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GTKX11 = @GTKX11@
 HAVE_MSGFMT = @HAVE_MSGFMT@
 HOST_CC = @HOST_CC@
 INSTALL = @INSTALL@
@@ -356,6 +358,7 @@ SQLITE3 = @SQLITE3@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WERROR_CFLAGS = @WERROR_CFLAGS@
 X11 = @X11@
 XATTR_LIB = @XATTR_LIB@
 XGETTEXT = @XGETTEXT@
@@ -405,6 +408,7 @@ install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 libgc_dir = @libgc_dir@
+libgdiplus_install_loc = @libgdiplus_install_loc@
 libgdiplus_loc = @libgdiplus_loc@
 libmono_cflags = @libmono_cflags@
 libmono_ldflags = @libmono_ldflags@

support/grp.c

@@ -8,7 +8,9 @@
  */
 
 #include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
 #include <grp.h>
 #include <stdio.h>
 #include <stdlib.h>

support/macros.c

@@ -100,6 +100,15 @@ char *helper_Mono_Posix_readdir(void *dir) {
 }
 
 #if HAVE_GETPWNAM_R
+int helper_Mono_Posix_getpwnamuid (int mode, char *in_name, int in_uid,
+	char **account,
+	char **password,
+	int *uid,
+	int *gid,
+	char **name,
+	char **home,
+	char **shell);
+
 int helper_Mono_Posix_getpwnamuid (int mode, char *in_name, int in_uid,
 	char **account,
 	char **password,

support/minizip/zip.c

@@ -187,12 +187,13 @@ local void init_linkedlist(linkedlist_data *ll)
     ll->first_block = ll->last_block = NULL;
 }
 
+/*
 local void free_linkedlist(linkedlist_data *ll)
 {
     free_datablock(ll->first_block);
     ll->first_block = ll->last_block = NULL;
 }
-
+*/
 
 local int add_data_in_datablock(linkedlist_data *ll, const void *buf, uLong len)
 {

support/nl.c

@@ -221,8 +221,10 @@ ReadEvents (gpointer sock, gpointer buffer, gint32 count, gint32 size)
 		int addr_length;
 		int msg_type;
 		int table;
+#ifdef NL_DEBUG
 		int protocol;
 		int scope;
+#endif
 		int rtm_type;
 		gboolean have_dst;
 		gboolean have_src;
@@ -250,8 +252,10 @@ ReadEvents (gpointer sock, gpointer buffer, gint32 count, gint32 size)
 
 		addr_length = (family == AF_INET) ? 4 : 16;
 		table = rtp->rtm_table;
+#ifdef NL_DEBUG
 		protocol = rtp->rtm_protocol;
 		scope = rtp->rtm_scope;
+#endif
 		rtm_type = rtp->rtm_type;
 		NL_DEBUG_PRINT ("\tRTMSG table: %d %s", table, FIND_RT_TABLE_NAME (table));
 		if (table != RT_TABLE_MAIN && table != RT_TABLE_LOCAL)

support/old-map.c

@@ -155,8 +155,10 @@ int map_Mono_Posix_Signals (int x)
 		 return SIGXFSZ;
 	if (x == Mono_Posix_Signals_SIGVTALRM)
 		 return SIGVTALRM;
+#ifdef SIGPROF
 	if (x == Mono_Posix_Signals_SIGPROF)
 		 return SIGPROF;
+#endif
 	if (x == Mono_Posix_Signals_SIGWINCH)
 		 return SIGWINCH;
 #ifdef SIGIO

support/serial.c

@@ -5,6 +5,9 @@
  * Author: Chris Toshok <toshok@ximian.com>
  */
 
+#include "map.h"
+#include "mph.h"
+
 #include <termios.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -12,7 +15,9 @@
 #include <errno.h>
 #if defined(__APPLE__)
 #include "fakepoll.h"
-#else
+#elif defined(HAVE_POLL_H)
+#include <poll.h>
+#elif defined(HAVE_SYS_POLL_H)
 #include <sys/poll.h>
 #endif
 #include <sys/ioctl.h>

support/supportw.c

@@ -158,6 +158,9 @@ FindWindowExW (gpointer hwndParent, gpointer hwndChildAfter, const char *classw,
 	return func (hwndParent, hwndChildAfter, classw, window);
 }
 
+int
+SetWindowPos (gpointer hwnd, gpointer hwndInsertAfter, int x, int y, int cx, int cy, unsigned int flags);
+
 int
 SetWindowPos (gpointer hwnd, gpointer hwndInsertAfter, int x, int y, int cx, int cy, unsigned int flags)
 {
@@ -165,6 +168,9 @@ SetWindowPos (gpointer hwnd, gpointer hwndInsertAfter, int x, int y, int cx, int
 	return 1;
 }
 
+int
+SendMessageA (gpointer hwnd, unsigned int msg, gpointer wparam, gpointer lparam);
+
 int
 SendMessageA (gpointer hwnd, unsigned int msg, gpointer wparam, gpointer lparam)
 {
@@ -172,6 +178,9 @@ SendMessageA (gpointer hwnd, unsigned int msg, gpointer wparam, gpointer lparam)
 	return 0;
 }
 
+int
+GetWindowLongA (gpointer hwnd, int a);
+
 int
 GetWindowLongA (gpointer hwnd, int a)
 {

support/sys-statvfs.c

@@ -25,7 +25,9 @@
 #endif /* def HAVE_SYS_STATVFS_H */
 
 #ifdef HAVE_GETFSSTAT
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
 #include <sys/ucred.h>
 #include <sys/mount.h>
 #include <unistd.h>     /* for pathconf */

support/sys-time.c

@@ -69,23 +69,6 @@ Mono_Posix_Syscall_settimeofday (
 	return r;
 }
 
-/* Remove this at some point in the future */
-gint32
-Mono_Posix_Syscall_utimes_bad (const char *filename,
-	struct Mono_Posix_Timeval *tv)
-{
-	struct timeval _tv;
-	struct timeval *ptv = NULL;
-
-	if (tv) {
-		_tv.tv_sec  = tv->tv_sec;
-		_tv.tv_usec = tv->tv_usec;
-		ptv = &_tv;
-	}
-
-	return utimes (filename, ptv);
-}
-
 static inline struct timeval*
 copy_utimes (struct timeval* to, struct Mono_Posix_Timeval *from)
 {

support/syslog.c

@@ -47,6 +47,9 @@ Mono_Posix_Syscall_syslog (int priority, const char* message)
 #endif
 
 /* vararg version of syslog(3). */
+gint32
+Mono_Posix_Syscall_syslog2 (int priority, const char *format, ...);
+
 gint32
 Mono_Posix_Syscall_syslog2 (int priority, const char *format, ...)
 {

support/x-struct-str.c

@@ -20,7 +20,7 @@
 		: lstr_at(p, n)                                             \
 )
 
-char* MPH_INTERNAL
+char*
 _mph_copy_structure_strings (
 	void *to,         const mph_string_offset_t *to_offsets, 
 	const void *from, const mph_string_offset_t *from_offsets, 

support/zlib-helper.c

@@ -45,7 +45,7 @@ gint WriteZStream (ZStream *stream, guchar *buffer, gint length);
 static gint flush_internal (ZStream *stream, gboolean is_final);
 
 static void *
-z_alloc (void *opaque, gsize nitems, gsize item_size)
+z_alloc (void *opaque, unsigned int nitems, unsigned int item_size)
 {
 	return g_malloc0 (nitems * item_size);
 }