-diff -urN gtk-vnc-0.3.7.mingw/bootstrap gtk-vnc-0.3.7.gnulib/bootstrap
---- gtk-vnc-0.3.7.mingw/bootstrap 2008-10-09 12:19:03.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/bootstrap 2008-10-09 12:33:37.000000000 +0100
-@@ -65,6 +65,10 @@
- <$gnulib_tool || exit
-
- modules='
-+recv
-+send
-+socket
-+connect
- getaddrinfo
- vc-list-files
- '
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/alloca.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/alloca.in.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/alloca.in.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/alloca.in.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/alloca.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/alloca.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/alloca.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/alloca.in.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,56 @@
+/* Memory allocation on the stack.
+
+#endif
+
+#endif /* _GL_ALLOCA_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/arpa_inet.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/arpa_inet.in.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/arpa_inet.in.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/arpa_inet.in.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/arpa_inet.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/arpa_inet.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/arpa_inet.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/arpa_inet.in.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,80 @@
+/* A GNU-like <arpa/inet.h>.
+
+
+#endif /* _GL_ARPA_INET_H */
+#endif /* _GL_ARPA_INET_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/asnprintf.c gtk-vnc-0.3.7.gnulib/gnulib/lib/asnprintf.c
---- gtk-vnc-0.3.7.mingw/gnulib/lib/asnprintf.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/asnprintf.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/asnprintf.c gtk-vnc-0.3.7.gnulib/gnulib/lib/asnprintf.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/asnprintf.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/asnprintf.c 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,35 @@
+/* Formatted output to strings.
+ Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+ va_end (args);
+ return result;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/dummy.c gtk-vnc-0.3.7.gnulib/gnulib/lib/dummy.c
---- gtk-vnc-0.3.7.mingw/gnulib/lib/dummy.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/dummy.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/dummy.c gtk-vnc-0.3.7.gnulib/gnulib/lib/dummy.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/dummy.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/dummy.c 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,42 @@
+/* A dummy file, to prevent empty libraries from breaking builds.
+ Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+ this file is never empty. */
+typedef int dummy;
+#endif
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/errno.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/errno.in.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/errno.in.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/errno.in.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/errno.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/errno.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/errno.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/errno.in.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,153 @@
+/* A POSIX-like <errno.h>.
+
+
+#endif /* _GL_ERRNO_H */
+#endif /* _GL_ERRNO_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/float+.h gtk-vnc-0.3.7.gnulib/gnulib/lib/float+.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/float+.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/float+.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/float+.h gtk-vnc-0.3.7.gnulib/gnulib/lib/float+.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/float+.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/float+.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,148 @@
+/* Supplemental information about the floating-point formats.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+typedef int verify_sizeof_ldbl[2 * (SIZEOF_LDBL <= sizeof (long double)) - 1];
+
+#endif /* _FLOATPLUS_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/float.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/float.in.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/float.in.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/float.in.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/float.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/float.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/float.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/float.in.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,60 @@
+/* A correct <float.h>.
+
+
+#endif /* _GL_FLOAT_H */
+#endif /* _GL_FLOAT_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/gai_strerror.c gtk-vnc-0.3.7.gnulib/gnulib/lib/gai_strerror.c
---- gtk-vnc-0.3.7.mingw/gnulib/lib/gai_strerror.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/gai_strerror.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/gai_strerror.c gtk-vnc-0.3.7.gnulib/gnulib/lib/gai_strerror.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/gai_strerror.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/gai_strerror.c 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,78 @@
+/* Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+#ifdef _LIBC
+libc_hidden_def (gai_strerror)
+#endif
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/getaddrinfo.c gtk-vnc-0.3.7.gnulib/gnulib/lib/getaddrinfo.c
---- gtk-vnc-0.3.7.mingw/gnulib/lib/getaddrinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/getaddrinfo.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/getaddrinfo.c gtk-vnc-0.3.7.gnulib/gnulib/lib/getaddrinfo.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/getaddrinfo.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/getaddrinfo.c 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,419 @@
+/* Get address information (partial implementation).
+ Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software
+
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/getaddrinfo.h gtk-vnc-0.3.7.gnulib/gnulib/lib/getaddrinfo.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/getaddrinfo.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/getaddrinfo.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/getaddrinfo.h gtk-vnc-0.3.7.gnulib/gnulib/lib/getaddrinfo.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/getaddrinfo.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/getaddrinfo.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,163 @@
+/* Get address information.
+ Copyright (C) 1996-2002, 2003, 2004, 2005, 2006, 2008
+#endif
+
+#endif /* GETADDRINFO_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/gettext.h gtk-vnc-0.3.7.gnulib/gnulib/lib/gettext.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/gettext.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/gettext.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/gettext.h gtk-vnc-0.3.7.gnulib/gnulib/lib/gettext.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/gettext.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/gettext.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,270 @@
+/* Convenience header for conditional use of GNU <libintl.h>.
+ Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc.
+}
+
+#endif /* _LIBGETTEXT_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/inet_ntop.c gtk-vnc-0.3.7.gnulib/gnulib/lib/inet_ntop.c
---- gtk-vnc-0.3.7.mingw/gnulib/lib/inet_ntop.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/inet_ntop.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/inet_ntop.c gtk-vnc-0.3.7.gnulib/gnulib/lib/inet_ntop.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/inet_ntop.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/inet_ntop.c 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,238 @@
+/* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
+
+}
+
+#endif
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/Makefile.am gtk-vnc-0.3.7.gnulib/gnulib/lib/Makefile.am
---- gtk-vnc-0.3.7.mingw/gnulib/lib/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/Makefile.am 2008-10-09 12:33:42.000000000 +0100
-@@ -0,0 +1,484 @@
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/Makefile.am gtk-vnc-0.3.7.gnulib/gnulib/lib/Makefile.am
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/Makefile.am 2008-10-09 15:24:53.000000000 +0100
+@@ -0,0 +1,605 @@
+## DO NOT EDIT! GENERATED AUTOMATICALLY!
+## Process this file with automake to produce Makefile.in.
+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
-+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=gnulib/tests --aux-dir=. --with-tests --lgpl=2 --libtool --macro-prefix=gl connect getaddrinfo recv send socket vc-list-files
++# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=gnulib/tests --aux-dir=. --with-tests --lgpl=2 --libtool --macro-prefix=gl connect getaddrinfo malloc recv send socket vc-list-files
+
+AUTOMAKE_OPTIONS = 1.5 gnits
+
+
+## end gnulib module link-warning
+
++## begin gnulib module malloc
++
++
++EXTRA_DIST += malloc.c
++
++EXTRA_libgnu_la_SOURCES += malloc.c
++
++## end gnulib module malloc
++
++## begin gnulib module malloc-posix
++
++
++EXTRA_DIST += malloc.c
++
++EXTRA_libgnu_la_SOURCES += malloc.c
++
++## end gnulib module malloc-posix
++
+## begin gnulib module netinet_in
+
+BUILT_SOURCES += $(NETINET_IN_H)
+
+## end gnulib module stdio
+
++## begin gnulib module stdlib
++
++BUILT_SOURCES += stdlib.h
++
++# We need the following in order to create <stdlib.h> when the system
++# doesn't have one that works with the given compiler.
++stdlib.h: stdlib.in.h
++ rm -f $@-t $@
++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
++ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
++ -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
++ -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
++ -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
++ -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
++ -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
++ -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
++ -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
++ -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
++ -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
++ -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
++ -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
++ -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
++ -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
++ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
++ -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
++ -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
++ -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
++ -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
++ -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
++ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
++ -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
++ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
++ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
++ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
++ -e 's|@''VOID_UNSETENV''@|$(VOID_UNSETENV)|g' \
++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
++ < $(srcdir)/stdlib.in.h; \
++ } > $@-t
++ mv $@-t $@
++MOSTLYCLEANFILES += stdlib.h stdlib.h-t
++
++EXTRA_DIST += stdlib.in.h
++
++## end gnulib module stdlib
++
+## begin gnulib module sys_socket
+
+BUILT_SOURCES += $(SYS_SOCKET_H)
+
+## end gnulib module sys_socket
+
++## begin gnulib module unistd
++
++BUILT_SOURCES += unistd.h
++
++# We need the following in order to create an empty placeholder for
++# <unistd.h> when the system doesn't have one.
++unistd.h: unistd.in.h
++ rm -f $@-t $@
++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
++ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
++ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
++ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
++ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
++ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
++ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
++ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
++ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
++ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
++ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
++ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
++ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
++ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
++ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
++ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
++ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
++ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
++ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
++ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
++ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
++ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
++ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
++ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
++ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
++ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
++ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
++ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
++ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
++ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
++ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
++ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
++ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
++ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
++ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
++ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
++ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \
++ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
++ < $(srcdir)/unistd.in.h; \
++ } > $@-t
++ mv $@-t $@
++MOSTLYCLEANFILES += unistd.h unistd.h-t
++
++EXTRA_DIST += unistd.in.h
++
++## end gnulib module unistd
++
+## begin gnulib module vasnprintf
+
+
+ fi; \
+ done; \
+ :
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/Makefile.am~ gtk-vnc-0.3.7.gnulib/gnulib/lib/Makefile.am~
---- gtk-vnc-0.3.7.mingw/gnulib/lib/Makefile.am~ 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/Makefile.am~ 2008-10-09 12:24:40.000000000 +0100
-@@ -0,0 +1,448 @@
-+## DO NOT EDIT! GENERATED AUTOMATICALLY!
-+## Process this file with automake to produce Makefile.in.
-+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License. As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# Generated by gnulib-tool.
-+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=gnulib/tests --aux-dir=. --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo vc-list-files
-+
-+AUTOMAKE_OPTIONS = 1.5 gnits
-+
-+SUBDIRS =
-+noinst_HEADERS =
-+noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+EXTRA_DIST =
-+BUILT_SOURCES =
-+SUFFIXES =
-+MOSTLYCLEANFILES = core *.stackdump
-+MOSTLYCLEANDIRS =
-+CLEANFILES =
-+DISTCLEANFILES =
-+MAINTAINERCLEANFILES =
-+
-+AM_CPPFLAGS =
-+
-+noinst_LTLIBRARIES += libgnu.la
-+
-+libgnu_la_SOURCES =
-+libgnu_la_LIBADD = $(gl_LTLIBOBJS)
-+libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
-+EXTRA_libgnu_la_SOURCES =
-+libgnu_la_LDFLAGS = $(AM_LDFLAGS)
-+
-+## begin gnulib module alloca-opt
-+
-+BUILT_SOURCES += $(ALLOCA_H)
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/malloc.c gtk-vnc-0.3.7.gnulib/gnulib/lib/malloc.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/malloc.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/malloc.c 2008-10-09 15:24:52.000000000 +0100
+@@ -0,0 +1,57 @@
++/* malloc() function that is glibc compatible.
+
-+# We need the following in order to create <alloca.h> when the system
-+# doesn't have one that works with the given compiler.
-+alloca.h: alloca.in.h
-+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+ cat $(srcdir)/alloca.in.h; \
-+ } > $@-t
-+ mv -f $@-t $@
-+MOSTLYCLEANFILES += alloca.h alloca.h-t
++ Copyright (C) 1997, 1998, 2006, 2007 Free Software Foundation, Inc.
+
-+EXTRA_DIST += alloca.in.h
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as published by
++ the Free Software Foundation; either version 2.1, or (at your option)
++ any later version.
+
-+## end gnulib module alloca-opt
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Lesser General Public License for more details.
+
-+## begin gnulib module arpa_inet
++ You should have received a copy of the GNU Lesser General Public License
++ along with this program; if not, write to the Free Software Foundation,
++ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
-+BUILT_SOURCES += $(ARPA_INET_H)
++/* written by Jim Meyering and Bruno Haible */
+
-+# We need the following in order to create <arpa/inet.h> when the system
-+# doesn't have one.
-+arpa/inet.h:
-+ @MKDIR_P@ arpa
-+ rm -f $@-t $@
-+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+ -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \
-+ -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \
-+ -e 's|@''GNULIB_INET_NTOP''@|$(GNULIB_INET_NTOP)|g' \
-+ -e 's|@''GNULIB_INET_PTON''@|$(GNULIB_INET_PTON)|g' \
-+ -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \
-+ -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \
-+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-+ < $(srcdir)/arpa_inet.in.h; \
-+ } > $@-t
-+ mv $@-t $@
-+MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
-+MOSTLYCLEANDIRS += arpa
++#include <config.h>
++/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */
++#ifdef malloc
++# define NEED_MALLOC_GNU
++# undef malloc
++#endif
+
-+EXTRA_DIST += arpa_inet.in.h
++/* Specification. */
++#include <stdlib.h>
+
-+## end gnulib module arpa_inet
++#include <errno.h>
+
-+## begin gnulib module errno
++/* Call the system's malloc below. */
++#undef malloc
+
-+BUILT_SOURCES += $(ERRNO_H)
++/* Allocate an N-byte block of memory from the heap.
++ If N is zero, allocate a 1-byte block. */
+
-+# We need the following in order to create <errno.h> when the system
-+# doesn't have one that is POSIX compliant.
-+errno.h: errno.in.h
-+ rm -f $@-t $@
-+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+ -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
-+ -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
-+ -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
-+ -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \
-+ -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
-+ -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
-+ -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
-+ < $(srcdir)/errno.in.h; \
-+ } > $@-t
-+ mv $@-t $@
-+MOSTLYCLEANFILES += errno.h errno.h-t
++void *
++rpl_malloc (size_t n)
++{
++ void *result;
+
-+EXTRA_DIST += errno.in.h
++#ifdef NEED_MALLOC_GNU
++ if (n == 0)
++ n = 1;
++#endif
+
-+## end gnulib module errno
++ result = malloc (n);
+
-+## begin gnulib module float
++#if !HAVE_MALLOC_POSIX
++ if (result == NULL)
++ errno = ENOMEM;
++#endif
+
-+BUILT_SOURCES += $(FLOAT_H)
++ return result;
++}
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/netinet_in.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/netinet_in.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/netinet_in.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/netinet_in.in.h 2008-10-09 15:24:52.000000000 +0100
+@@ -0,0 +1,45 @@
++/* Substitute for <netinet/in.h>.
++ Copyright (C) 2007-2008 Free Software Foundation, Inc.
+
-+# We need the following in order to create <float.h> when the system
-+# doesn't have one that works with the given compiler.
-+float.h: float.in.h
-+ rm -f $@-t $@
-+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+ -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
-+ < $(srcdir)/float.in.h; \
-+ } > $@-t
-+ mv $@-t $@
-+MOSTLYCLEANFILES += float.h float.h-t
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as published by
++ the Free Software Foundation; either version 2.1, or (at your option)
++ any later version.
+
-+EXTRA_DIST += float.in.h
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Lesser General Public License for more details.
+
-+## end gnulib module float
++ You should have received a copy of the GNU Lesser General Public License
++ along with this program; if not, write to the Free Software Foundation,
++ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
-+## begin gnulib module getaddrinfo
++#ifndef _GL_NETINET_IN_H
+
++#if @HAVE_NETINET_IN_H@
+
-+EXTRA_DIST += gai_strerror.c getaddrinfo.c getaddrinfo.h
++@PRAGMA_SYSTEM_HEADER@
+
-+EXTRA_libgnu_la_SOURCES += gai_strerror.c getaddrinfo.c
++/* On many platforms, <netinet/in.h> assumes prior inclusion of
++ <sys/types.h>. */
++# include <sys/types.h>
+
-+## end gnulib module getaddrinfo
++/* The include_next requires a split double-inclusion guard. */
++# @INCLUDE_NEXT@ @NEXT_NETINET_IN_H@
+
-+## begin gnulib module gettext-h
++#endif
+
-+libgnu_la_SOURCES += gettext.h
++#ifndef _GL_NETINET_IN_H
++#define _GL_NETINET_IN_H
+
-+## end gnulib module gettext-h
++#if !@HAVE_NETINET_IN_H@
+
-+## begin gnulib module inet_ntop
++/* A platform that lacks <netinet/in.h>. */
+
++# include <sys/socket.h>
+
-+EXTRA_DIST += inet_ntop.c
++#endif
+
-+EXTRA_libgnu_la_SOURCES += inet_ntop.c
++#endif /* _GL_NETINET_IN_H */
++#endif /* _GL_NETINET_IN_H */
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/printf-args.c gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-args.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/printf-args.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-args.c 2008-10-09 15:24:52.000000000 +0100
+@@ -0,0 +1,187 @@
++/* Decomposed printf argument list.
++ Copyright (C) 1999, 2002-2003, 2005-2007 Free Software Foundation, Inc.
+
-+## end gnulib module inet_ntop
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as published by
++ the Free Software Foundation; either version 2.1, or (at your option)
++ any later version.
+
-+## begin gnulib module link-warning
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Lesser General Public License for more details.
+
-+LINK_WARNING_H=$(top_srcdir)/./link-warning.h
++ You should have received a copy of the GNU Lesser General Public License along
++ with this program; if not, write to the Free Software Foundation,
++ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
-+EXTRA_DIST += $(top_srcdir)/./link-warning.h
++/* This file can be parametrized with the following macros:
++ ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions.
++ PRINTF_FETCHARGS Name of the function to be defined.
++ STATIC Set to 'static' to declare the function static. */
+
-+## end gnulib module link-warning
++#ifndef PRINTF_FETCHARGS
++# include <config.h>
++#endif
+
-+## begin gnulib module netinet_in
++/* Specification. */
++#ifndef PRINTF_FETCHARGS
++# include "printf-args.h"
++#endif
+
-+BUILT_SOURCES += $(NETINET_IN_H)
-+
-+# We need the following in order to create <netinet/in.h> when the system
-+# doesn't have one.
-+netinet/in.h: netinet_in.in.h
-+ @MKDIR_P@ netinet
-+ rm -f $@-t $@
-+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+ -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
-+ -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \
-+ < $(srcdir)/netinet_in.in.h; \
-+ } > $@-t
-+ mv $@-t $@
-+MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
-+MOSTLYCLEANDIRS += netinet
-+
-+EXTRA_DIST += netinet_in.in.h
-+
-+## end gnulib module netinet_in
-+
-+## begin gnulib module size_max
-+
-+libgnu_la_SOURCES += size_max.h
-+
-+## end gnulib module size_max
-+
-+## begin gnulib module snprintf
-+
-+
-+EXTRA_DIST += snprintf.c
-+
-+EXTRA_libgnu_la_SOURCES += snprintf.c
-+
-+## end gnulib module snprintf
-+
-+## begin gnulib module stdbool
-+
-+BUILT_SOURCES += $(STDBOOL_H)
-+
-+# We need the following in order to create <stdbool.h> when the system
-+# doesn't have one that works.
-+stdbool.h: stdbool.in.h
-+ rm -f $@-t $@
-+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
-+ } > $@-t
-+ mv $@-t $@
-+MOSTLYCLEANFILES += stdbool.h stdbool.h-t
-+
-+EXTRA_DIST += stdbool.in.h
-+
-+## end gnulib module stdbool
-+
-+## begin gnulib module stdint
-+
-+BUILT_SOURCES += $(STDINT_H)
-+
-+# We need the following in order to create <stdint.h> when the system
-+# doesn't have one that works with the given compiler.
-+stdint.h: stdint.in.h
-+ rm -f $@-t $@
-+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+ sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
-+ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
-+ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-+ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
-+ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
-+ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
-+ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
-+ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
-+ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
-+ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
-+ -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
-+ -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
-+ -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
-+ -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
-+ -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
-+ -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
-+ -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
-+ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
-+ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
-+ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-+ < $(srcdir)/stdint.in.h; \
-+ } > $@-t
-+ mv $@-t $@
-+MOSTLYCLEANFILES += stdint.h stdint.h-t
-+
-+EXTRA_DIST += stdint.in.h
-+
-+## end gnulib module stdint
-+
-+## begin gnulib module stdio
-+
-+BUILT_SOURCES += stdio.h
-+
-+# We need the following in order to create <stdio.h> when the system
-+# doesn't have one that works with the given compiler.
-+stdio.h: stdio.in.h
-+ rm -f $@-t $@
-+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+ -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
-+ -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
-+ -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
-+ -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
-+ -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
-+ -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
-+ -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
-+ -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
-+ -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
-+ -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
-+ -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
-+ -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
-+ -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
-+ -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
-+ -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
-+ -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
-+ -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
-+ -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
-+ -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
-+ -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
-+ -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
-+ -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
-+ -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
-+ -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
-+ -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
-+ -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
-+ -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
-+ -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
-+ -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
-+ -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
-+ -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
-+ -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
-+ -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
-+ -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
-+ -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
-+ -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
-+ -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \
-+ -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \
-+ -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
-+ -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \
-+ -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \
-+ -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \
-+ -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
-+ -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
-+ -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
-+ -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
-+ -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
-+ -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \
-+ -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
-+ -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \
-+ -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \
-+ -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \
-+ -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \
-+ -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \
-+ -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
-+ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
-+ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
-+ -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \
-+ -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \
-+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-+ < $(srcdir)/stdio.in.h; \
-+ } > $@-t
-+ mv $@-t $@
-+MOSTLYCLEANFILES += stdio.h stdio.h-t
-+
-+EXTRA_DIST += stdio-write.c stdio.in.h
-+
-+EXTRA_libgnu_la_SOURCES += stdio-write.c
-+
-+## end gnulib module stdio
-+
-+## begin gnulib module sys_socket
-+
-+BUILT_SOURCES += $(SYS_SOCKET_H)
-+
-+# We need the following in order to create <sys/socket.h> when the system
-+# doesn't have one that works with the given compiler.
-+sys/socket.h: sys_socket.in.h
-+ @MKDIR_P@ sys
-+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+ -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \
-+ -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \
-+ -e 's|@''GNULIB_SOCKET''@|$(GNULIB_SOCKET)|g' \
-+ -e 's|@''GNULIB_CONNECT''@|$(GNULIB_CONNECT)|g' \
-+ -e 's|@''GNULIB_ACCEPT''@|$(GNULIB_ACCEPT)|g' \
-+ -e 's|@''GNULIB_BIND''@|$(GNULIB_BIND)|g' \
-+ -e 's|@''GNULIB_GETPEERNAME''@|$(GNULIB_GETPEERNAME)|g' \
-+ -e 's|@''GNULIB_GETSOCKNAME''@|$(GNULIB_GETSOCKNAME)|g' \
-+ -e 's|@''GNULIB_GETSOCKOPT''@|$(GNULIB_GETSOCKOPT)|g' \
-+ -e 's|@''GNULIB_LISTEN''@|$(GNULIB_LISTEN)|g' \
-+ -e 's|@''GNULIB_RECV''@|$(GNULIB_RECV)|g' \
-+ -e 's|@''GNULIB_SEND''@|$()GNULIB_SEND|g' \
-+ -e 's|@''GNULIB_RECVFROM''@|$(GNULIB_RECVFROM)|g' \
-+ -e 's|@''GNULIB_SENDTO''@|$(GNULIB_SENDTO)|g' \
-+ -e 's|@''GNULIB_SETSOCKOPT''@|$(GNULIB_SETSOCKOPT)|g' \
-+ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
-+ -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
-+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-+ < $(srcdir)/sys_socket.in.h; \
-+ } > $@-t
-+ mv -f $@-t $@
-+MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
-+MOSTLYCLEANDIRS += sys
-+
-+EXTRA_DIST += sys_socket.in.h winsock.c
-+
-+EXTRA_libgnu_la_SOURCES += winsock.c
-+
-+## end gnulib module sys_socket
-+
-+## begin gnulib module vasnprintf
-+
-+
-+EXTRA_DIST += asnprintf.c float+.h printf-args.c printf-args.h printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h
-+
-+EXTRA_libgnu_la_SOURCES += asnprintf.c printf-args.c printf-parse.c vasnprintf.c
-+
-+## end gnulib module vasnprintf
-+
-+## begin gnulib module vc-list-files
-+
-+
-+EXTRA_DIST += $(top_srcdir)/./vc-list-files
-+
-+## end gnulib module vc-list-files
-+
-+## begin gnulib module wchar
-+
-+BUILT_SOURCES += $(WCHAR_H)
-+
-+# We need the following in order to create <wchar.h> when the system
-+# version does not work standalone.
-+wchar.h: wchar.in.h
-+ rm -f $@-t $@
-+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
-+ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
-+ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
-+ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-+ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-+ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-+ < $(srcdir)/wchar.in.h; \
-+ } > $@-t
-+ mv $@-t $@
-+MOSTLYCLEANFILES += wchar.h wchar.h-t
-+
-+EXTRA_DIST += wchar.in.h
-+
-+## end gnulib module wchar
-+
-+## begin gnulib module xsize
-+
-+libgnu_la_SOURCES += xsize.h
-+
-+## end gnulib module xsize
-+
-+## begin gnulib module dummy
-+
-+libgnu_la_SOURCES += dummy.c
-+
-+## end gnulib module dummy
-+
-+
-+mostlyclean-local: mostlyclean-generic
-+ @for dir in '' $(MOSTLYCLEANDIRS); do \
-+ if test -n "$$dir" && test -d $$dir; then \
-+ echo "rmdir $$dir"; rmdir $$dir; \
-+ fi; \
-+ done; \
-+ :
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/netinet_in.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/netinet_in.in.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/netinet_in.in.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/netinet_in.in.h 2008-10-09 12:24:39.000000000 +0100
-@@ -0,0 +1,45 @@
-+/* Substitute for <netinet/in.h>.
-+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU Lesser General Public License as published by
-+ the Free Software Foundation; either version 2.1, or (at your option)
-+ any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public License
-+ along with this program; if not, write to the Free Software Foundation,
-+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-+
-+#ifndef _GL_NETINET_IN_H
-+
-+#if @HAVE_NETINET_IN_H@
-+
-+@PRAGMA_SYSTEM_HEADER@
-+
-+/* On many platforms, <netinet/in.h> assumes prior inclusion of
-+ <sys/types.h>. */
-+# include <sys/types.h>
-+
-+/* The include_next requires a split double-inclusion guard. */
-+# @INCLUDE_NEXT@ @NEXT_NETINET_IN_H@
-+
-+#endif
-+
-+#ifndef _GL_NETINET_IN_H
-+#define _GL_NETINET_IN_H
-+
-+#if !@HAVE_NETINET_IN_H@
-+
-+/* A platform that lacks <netinet/in.h>. */
-+
-+# include <sys/socket.h>
-+
-+#endif
-+
-+#endif /* _GL_NETINET_IN_H */
-+#endif /* _GL_NETINET_IN_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/printf-args.c gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-args.c
---- gtk-vnc-0.3.7.mingw/gnulib/lib/printf-args.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-args.c 2008-10-09 12:24:39.000000000 +0100
-@@ -0,0 +1,187 @@
-+/* Decomposed printf argument list.
-+ Copyright (C) 1999, 2002-2003, 2005-2007 Free Software Foundation, Inc.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU Lesser General Public License as published by
-+ the Free Software Foundation; either version 2.1, or (at your option)
-+ any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public License along
-+ with this program; if not, write to the Free Software Foundation,
-+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-+
-+/* This file can be parametrized with the following macros:
-+ ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions.
-+ PRINTF_FETCHARGS Name of the function to be defined.
-+ STATIC Set to 'static' to declare the function static. */
-+
-+#ifndef PRINTF_FETCHARGS
-+# include <config.h>
-+#endif
-+
-+/* Specification. */
-+#ifndef PRINTF_FETCHARGS
-+# include "printf-args.h"
-+#endif
-+
-+#ifdef STATIC
-+STATIC
-+#endif
-+int
-+PRINTF_FETCHARGS (va_list args, arguments *a)
-+{
-+ size_t i;
-+ argument *ap;
++#ifdef STATIC
++STATIC
++#endif
++int
++PRINTF_FETCHARGS (va_list args, arguments *a)
++{
++ size_t i;
++ argument *ap;
+
+ for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++)
+ switch (ap->type)
+ }
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/printf-args.h gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-args.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/printf-args.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-args.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/printf-args.h gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-args.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/printf-args.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-args.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,154 @@
+/* Decomposed printf argument list.
+ Copyright (C) 1999, 2002-2003, 2006-2007 Free Software Foundation, Inc.
+int PRINTF_FETCHARGS (va_list args, arguments *a);
+
+#endif /* _PRINTF_ARGS_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/printf-parse.c gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-parse.c
---- gtk-vnc-0.3.7.mingw/gnulib/lib/printf-parse.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-parse.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/printf-parse.c gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-parse.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/printf-parse.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-parse.c 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,627 @@
+/* Formatted output to strings.
+ Copyright (C) 1999-2000, 2002-2003, 2006-2008 Free Software Foundation, Inc.
+#undef DIRECTIVE
+#undef CHAR_T_ONLY_ASCII
+#undef CHAR_T
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/printf-parse.h gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-parse.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/printf-parse.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-parse.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/printf-parse.h gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-parse.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/printf-parse.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/printf-parse.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,179 @@
+/* Parse printf format string.
+ Copyright (C) 1999, 2002-2003, 2005, 2007 Free Software Foundation, Inc.
+#endif
+
+#endif /* _PRINTF_PARSE_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/size_max.h gtk-vnc-0.3.7.gnulib/gnulib/lib/size_max.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/size_max.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/size_max.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/size_max.h gtk-vnc-0.3.7.gnulib/gnulib/lib/size_max.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/size_max.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/size_max.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,31 @@
+/* size_max.h -- declare SIZE_MAX through system headers
+ Copyright (C) 2005-2006 Free Software Foundation, Inc.
+ in config.h. */
+
+#endif /* GNULIB_SIZE_MAX_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/snprintf.c gtk-vnc-0.3.7.gnulib/gnulib/lib/snprintf.c
---- gtk-vnc-0.3.7.mingw/gnulib/lib/snprintf.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/snprintf.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/snprintf.c gtk-vnc-0.3.7.gnulib/gnulib/lib/snprintf.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/snprintf.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/snprintf.c 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,72 @@
+/* Formatted output to strings.
+ Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
+
+ return len;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/stdbool.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/stdbool.in.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/stdbool.in.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/stdbool.in.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/stdbool.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/stdbool.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/stdbool.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/stdbool.in.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,119 @@
+/* Copyright (C) 2001-2003, 2006-2008 Free Software Foundation, Inc.
+ Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+#define __bool_true_false_are_defined 1
+
+#endif /* _GL_STDBOOL_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/stdint.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/stdint.in.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/stdint.in.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/stdint.in.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/stdint.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/stdint.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/stdint.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/stdint.in.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,523 @@
+/* Copyright (C) 2001-2002, 2004-2008 Free Software Foundation, Inc.
+ Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
+
+#endif /* _GL_STDINT_H */
+#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/stdio.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/stdio.in.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/stdio.in.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/stdio.in.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/stdio.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/stdio.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/stdio.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/stdio.in.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,475 @@
+/* A GNU-like <stdio.h>.
+
+#endif /* _GL_STDIO_H */
+#endif /* _GL_STDIO_H */
+#endif
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/stdio-write.c gtk-vnc-0.3.7.gnulib/gnulib/lib/stdio-write.c
---- gtk-vnc-0.3.7.mingw/gnulib/lib/stdio-write.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/stdio-write.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/stdio-write.c gtk-vnc-0.3.7.gnulib/gnulib/lib/stdio-write.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/stdio-write.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/stdio-write.c 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,148 @@
+/* POSIX compatible FILE stream write function.
+ Copyright (C) 2008 Free Software Foundation, Inc.
+ return ret; \
+ }
+
-+# if !REPLACE_PRINTF_POSIX /* avoid collision with printf.c */
-+int
-+printf (const char *format, ...)
-+{
-+ int retval;
-+ va_list args;
++# if !REPLACE_PRINTF_POSIX /* avoid collision with printf.c */
++int
++printf (const char *format, ...)
++{
++ int retval;
++ va_list args;
++
++ va_start (args, format);
++ retval = vfprintf (stdout, format, args);
++ va_end (args);
++
++ return retval;
++}
++# endif
++
++# if !REPLACE_FPRINTF_POSIX /* avoid collision with fprintf.c */
++int
++fprintf (FILE *stream, const char *format, ...)
++{
++ int retval;
++ va_list args;
++
++ va_start (args, format);
++ retval = vfprintf (stream, format, args);
++ va_end (args);
++
++ return retval;
++}
++# endif
++
++# if !REPLACE_VFPRINTF_POSIX /* avoid collision with vprintf.c */
++int
++vprintf (const char *format, va_list args)
++{
++ return vfprintf (stdout, format, args);
++}
++# endif
++
++# if !REPLACE_VPRINTF_POSIX /* avoid collision with vfprintf.c */
++int
++vfprintf (FILE *stream, const char *format, va_list args)
++#undef vfprintf
++{
++ CALL_WITH_SIGPIPE_EMULATION (int, vfprintf (stream, format, args), ret == EOF)
++}
++# endif
++
++int
++putchar (int c)
++{
++ return fputc (c, stdout);
++}
++
++int
++fputc (int c, FILE *stream)
++#undef fputc
++{
++ CALL_WITH_SIGPIPE_EMULATION (int, fputc (c, stream), ret == EOF)
++}
++
++int
++fputs (const char *string, FILE *stream)
++#undef fputs
++{
++ CALL_WITH_SIGPIPE_EMULATION (int, fputs (string, stream), ret == EOF)
++}
++
++int
++puts (const char *string)
++#undef puts
++{
++ FILE *stream = stdout;
++ CALL_WITH_SIGPIPE_EMULATION (int, puts (string), ret == EOF)
++}
++
++size_t
++fwrite (const void *ptr, size_t s, size_t n, FILE *stream)
++#undef fwrite
++{
++ CALL_WITH_SIGPIPE_EMULATION (size_t, fwrite (ptr, s, n, stream), ret < n)
++}
++
++# endif
++#endif
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/stdlib.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/stdlib.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/stdlib.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/stdlib.in.h 2008-10-09 15:24:52.000000000 +0100
+@@ -0,0 +1,242 @@
++/* A GNU-like <stdlib.h>.
++
++ Copyright (C) 1995, 2001-2004, 2006-2008 Free Software Foundation, Inc.
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as published by
++ the Free Software Foundation; either version 2.1 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>. */
++
++@PRAGMA_SYSTEM_HEADER@
++
++#if defined __need_malloc_and_calloc
++/* Special invocation convention inside glibc header files. */
++
++#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
++
++#else
++/* Normal invocation convention. */
++
++#ifndef _GL_STDLIB_H
++
++/* The include_next requires a split double-inclusion guard. */
++#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
++
++#ifndef _GL_STDLIB_H
++#define _GL_STDLIB_H
++
++
++/* The definition of GL_LINK_WARNING is copied here. */
++
++
++/* Some systems do not define EXIT_*, despite otherwise supporting C89. */
++#ifndef EXIT_SUCCESS
++# define EXIT_SUCCESS 0
++#endif
++/* Tandem/NSK and other platforms that define EXIT_FAILURE as -1 interfere
++ with proper operation of xargs. */
++#ifndef EXIT_FAILURE
++# define EXIT_FAILURE 1
++#elif EXIT_FAILURE != 1
++# undef EXIT_FAILURE
++# define EXIT_FAILURE 1
++#endif
++
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++
++#if @GNULIB_MALLOC_POSIX@
++# if !@HAVE_MALLOC_POSIX@
++# undef malloc
++# define malloc rpl_malloc
++extern void * malloc (size_t size);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef malloc
++# define malloc(s) \
++ (GL_LINK_WARNING ("malloc is not POSIX compliant everywhere - " \
++ "use gnulib module malloc-posix for portability"), \
++ malloc (s))
++#endif
++
++
++#if @GNULIB_REALLOC_POSIX@
++# if !@HAVE_REALLOC_POSIX@
++# undef realloc
++# define realloc rpl_realloc
++extern void * realloc (void *ptr, size_t size);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef realloc
++# define realloc(p,s) \
++ (GL_LINK_WARNING ("realloc is not POSIX compliant everywhere - " \
++ "use gnulib module realloc-posix for portability"), \
++ realloc (p, s))
++#endif
++
++
++#if @GNULIB_CALLOC_POSIX@
++# if !@HAVE_CALLOC_POSIX@
++# undef calloc
++# define calloc rpl_calloc
++extern void * calloc (size_t nmemb, size_t size);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef calloc
++# define calloc(n,s) \
++ (GL_LINK_WARNING ("calloc is not POSIX compliant everywhere - " \
++ "use gnulib module calloc-posix for portability"), \
++ calloc (n, s))
++#endif
++
++
++#if @GNULIB_GETSUBOPT@
++/* Assuming *OPTIONP is a comma separated list of elements of the form
++ "token" or "token=value", getsubopt parses the first of these elements.
++ If the first element refers to a "token" that is member of the given
++ NULL-terminated array of tokens:
++ - It replaces the comma with a NUL byte, updates *OPTIONP to point past
++ the first option and the comma, sets *VALUEP to the value of the
++ element (or NULL if it doesn't contain an "=" sign),
++ - It returns the index of the "token" in the given array of tokens.
++ Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined.
++ For more details see the POSIX:2001 specification.
++ http://www.opengroup.org/susv3xsh/getsubopt.html */
++# if !@HAVE_GETSUBOPT@
++extern int getsubopt (char **optionp, char *const *tokens, char **valuep);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef getsubopt
++# define getsubopt(o,t,v) \
++ (GL_LINK_WARNING ("getsubopt is unportable - " \
++ "use gnulib module getsubopt for portability"), \
++ getsubopt (o, t, v))
++#endif
++
++
++#if @GNULIB_MKDTEMP@
++# if !@HAVE_MKDTEMP@
++/* Create a unique temporary directory from TEMPLATE.
++ The last six characters of TEMPLATE must be "XXXXXX";
++ they are replaced with a string that makes the directory name unique.
++ Returns TEMPLATE, or a null pointer if it cannot get a unique name.
++ The directory is created mode 700. */
++extern char * mkdtemp (char * /*template*/);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef mkdtemp
++# define mkdtemp(t) \
++ (GL_LINK_WARNING ("mkdtemp is unportable - " \
++ "use gnulib module mkdtemp for portability"), \
++ mkdtemp (t))
++#endif
++
++
++#if @GNULIB_MKSTEMP@
++# if @REPLACE_MKSTEMP@
++/* Create a unique temporary file from TEMPLATE.
++ The last six characters of TEMPLATE must be "XXXXXX";
++ they are replaced with a string that makes the file name unique.
++ The file is then created, ensuring it didn't exist before.
++ The file is created read-write (mask at least 0600 & ~umask), but it may be
++ world-readable and world-writable (mask 0666 & ~umask), depending on the
++ implementation.
++ Returns the open file descriptor if successful, otherwise -1 and errno
++ set. */
++# define mkstemp rpl_mkstemp
++extern int mkstemp (char * /*template*/);
++# else
++/* On MacOS X 10.3, only <unistd.h> declares mkstemp. */
++# include <unistd.h>
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef mkstemp
++# define mkstemp(t) \
++ (GL_LINK_WARNING ("mkstemp is unportable - " \
++ "use gnulib module mkstemp for portability"), \
++ mkstemp (t))
++#endif
++
+
-+ va_start (args, format);
-+ retval = vfprintf (stdout, format, args);
-+ va_end (args);
++#if @GNULIB_PUTENV@
++# if @REPLACE_PUTENV@
++# undef putenv
++# define putenv rpl_putenv
++extern int putenv (char *string);
++# endif
++#endif
+
-+ return retval;
-+}
-+# endif
+
-+# if !REPLACE_FPRINTF_POSIX /* avoid collision with fprintf.c */
-+int
-+fprintf (FILE *stream, const char *format, ...)
-+{
-+ int retval;
-+ va_list args;
++#if @GNULIB_RPMATCH@
++# if !@HAVE_RPMATCH@
++/* Test a user response to a question.
++ Return 1 if it is affirmative, 0 if it is negative, or -1 if not clear. */
++extern int rpmatch (const char *response);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef rpmatch
++# define rpmatch(r) \
++ (GL_LINK_WARNING ("rpmatch is unportable - " \
++ "use gnulib module rpmatch for portability"), \
++ rpmatch (r))
++#endif
+
-+ va_start (args, format);
-+ retval = vfprintf (stream, format, args);
-+ va_end (args);
+
-+ return retval;
-+}
-+# endif
++#if @GNULIB_SETENV@
++# if !@HAVE_SETENV@
++/* Set NAME to VALUE in the environment.
++ If REPLACE is nonzero, overwrite an existing value. */
++extern int setenv (const char *name, const char *value, int replace);
++# endif
++#endif
+
-+# if !REPLACE_VFPRINTF_POSIX /* avoid collision with vprintf.c */
-+int
-+vprintf (const char *format, va_list args)
-+{
-+ return vfprintf (stdout, format, args);
-+}
-+# endif
+
-+# if !REPLACE_VPRINTF_POSIX /* avoid collision with vfprintf.c */
-+int
-+vfprintf (FILE *stream, const char *format, va_list args)
-+#undef vfprintf
-+{
-+ CALL_WITH_SIGPIPE_EMULATION (int, vfprintf (stream, format, args), ret == EOF)
-+}
++#if @GNULIB_UNSETENV@
++# if @HAVE_UNSETENV@
++# if @VOID_UNSETENV@
++/* On some systems, unsetenv() returns void.
++ This is the case for MacOS X 10.3, FreeBSD 4.8, NetBSD 1.6, OpenBSD 3.4. */
++# define unsetenv(name) ((unsetenv)(name), 0)
+# endif
++# else
++/* Remove the variable NAME from the environment. */
++extern int unsetenv (const char *name);
++# endif
++#endif
+
-+int
-+putchar (int c)
-+{
-+ return fputc (c, stdout);
-+}
-+
-+int
-+fputc (int c, FILE *stream)
-+#undef fputc
-+{
-+ CALL_WITH_SIGPIPE_EMULATION (int, fputc (c, stream), ret == EOF)
-+}
+
-+int
-+fputs (const char *string, FILE *stream)
-+#undef fputs
-+{
-+ CALL_WITH_SIGPIPE_EMULATION (int, fputs (string, stream), ret == EOF)
-+}
++#if @GNULIB_STRTOD@
++# if @REPLACE_STRTOD@
++# define strtod rpl_strtod
++# endif
++# if !@HAVE_STRTOD@ || @REPLACE_STRTOD@
++ /* Parse a double from STRING, updating ENDP if appropriate. */
++extern double strtod (const char *str, char **endp);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef strtod
++# define strtod(s, e) \
++ (GL_LINK_WARNING ("strtod is unportable - " \
++ "use gnulib module strtod for portability"), \
++ strtod (s, e))
++#endif
+
-+int
-+puts (const char *string)
-+#undef puts
-+{
-+ FILE *stream = stdout;
-+ CALL_WITH_SIGPIPE_EMULATION (int, puts (string), ret == EOF)
-+}
+
-+size_t
-+fwrite (const void *ptr, size_t s, size_t n, FILE *stream)
-+#undef fwrite
-+{
-+ CALL_WITH_SIGPIPE_EMULATION (size_t, fwrite (ptr, s, n, stream), ret < n)
++#ifdef __cplusplus
+}
++#endif
+
-+# endif
++#endif /* _GL_STDLIB_H */
++#endif /* _GL_STDLIB_H */
+#endif
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/sys_socket.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/sys_socket.in.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/sys_socket.in.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/sys_socket.in.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/sys_socket.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/sys_socket.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/sys_socket.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/sys_socket.in.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,386 @@
+/* Provide a sys/socket header file for systems lacking it (read: MinGW)
+ and for systems where it is incomplete.
+
+#endif /* _GL_SYS_SOCKET_H */
+#endif /* _GL_SYS_SOCKET_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/vasnprintf.c gtk-vnc-0.3.7.gnulib/gnulib/lib/vasnprintf.c
---- gtk-vnc-0.3.7.mingw/gnulib/lib/vasnprintf.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/vasnprintf.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/unistd.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/unistd.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/unistd.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/unistd.in.h 2008-10-09 15:24:52.000000000 +0100
+@@ -0,0 +1,388 @@
++/* Substitute for and wrapper around <unistd.h>.
++ Copyright (C) 2004-2008 Free Software Foundation, Inc.
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License as published by
++ the Free Software Foundation; either version 2.1, or (at your option)
++ any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public License
++ along with this program; if not, write to the Free Software Foundation,
++ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
++
++#ifndef _GL_UNISTD_H
++
++@PRAGMA_SYSTEM_HEADER@
++
++/* The include_next requires a split double-inclusion guard. */
++#if @HAVE_UNISTD_H@
++# @INCLUDE_NEXT@ @NEXT_UNISTD_H@
++#endif
++
++#ifndef _GL_UNISTD_H
++#define _GL_UNISTD_H
++
++/* mingw doesn't define the SEEK_* macros in <unistd.h>. */
++#if !(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET)
++# include <stdio.h>
++#endif
++
++/* mingw fails to declare _exit in <unistd.h>. */
++#include <stdlib.h>
++
++#if @GNULIB_WRITE@ && @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@
++/* Get ssize_t. */
++# include <sys/types.h>
++#endif
++
++/* The definition of GL_LINK_WARNING is copied here. */
++
++
++/* Declare overridden functions. */
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++
++#if @GNULIB_CHOWN@
++# if @REPLACE_CHOWN@
++# ifndef REPLACE_CHOWN
++# define REPLACE_CHOWN 1
++# endif
++# if REPLACE_CHOWN
++/* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
++ to GID (if GID is not -1). Follow symbolic links.
++ Return 0 if successful, otherwise -1 and errno set.
++ See the POSIX:2001 specification
++ <http://www.opengroup.org/susv3xsh/chown.html>. */
++# define chown rpl_chown
++extern int chown (const char *file, uid_t uid, gid_t gid);
++# endif
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef chown
++# define chown(f,u,g) \
++ (GL_LINK_WARNING ("chown fails to follow symlinks on some systems and " \
++ "doesn't treat a uid or gid of -1 on some systems - " \
++ "use gnulib module chown for portability"), \
++ chown (f, u, g))
++#endif
++
++
++#if @GNULIB_DUP2@
++# if !@HAVE_DUP2@
++/* Copy the file descriptor OLDFD into file descriptor NEWFD. Do nothing if
++ NEWFD = OLDFD, otherwise close NEWFD first if it is open.
++ Return 0 if successful, otherwise -1 and errno set.
++ See the POSIX:2001 specification
++ <http://www.opengroup.org/susv3xsh/dup2.html>. */
++extern int dup2 (int oldfd, int newfd);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef dup2
++# define dup2(o,n) \
++ (GL_LINK_WARNING ("dup2 is unportable - " \
++ "use gnulib module dup2 for portability"), \
++ dup2 (o, n))
++#endif
++
++
++#if @GNULIB_ENVIRON@
++# if !@HAVE_DECL_ENVIRON@
++/* Set of environment variables and values. An array of strings of the form
++ "VARIABLE=VALUE", terminated with a NULL. */
++# if defined __APPLE__ && defined __MACH__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron ())
++# else
++extern char **environ;
++# endif
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef environ
++# define environ \
++ (GL_LINK_WARNING ("environ is unportable - " \
++ "use gnulib module environ for portability"), \
++ environ)
++#endif
++
++
++#if @GNULIB_FCHDIR@
++# if @REPLACE_FCHDIR@
++
++/* Change the process' current working directory to the directory on which
++ the given file descriptor is open.
++ Return 0 if successful, otherwise -1 and errno set.
++ See the POSIX:2001 specification
++ <http://www.opengroup.org/susv3xsh/fchdir.html>. */
++extern int fchdir (int /*fd*/);
++
++# define close rpl_close
++extern int close (int);
++# define dup rpl_dup
++extern int dup (int);
++# define dup2 rpl_dup2
++extern int dup2 (int, int);
++
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef fchdir
++# define fchdir(f) \
++ (GL_LINK_WARNING ("fchdir is unportable - " \
++ "use gnulib module fchdir for portability"), \
++ fchdir (f))
++#endif
++
++
++#if @GNULIB_FSYNC@
++/* Synchronize changes to a file.
++ Return 0 if successful, otherwise -1 and errno set.
++ See POSIX:2001 specification
++ <http://www.opengroup.org/susv3xsh/fsync.html>. */
++# if !@HAVE_FSYNC@
++extern int fsync (int fd);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef fsync
++# define fsync(fd) \
++ (GL_LINK_WARNING ("fsync is unportable - " \
++ "use gnulib module fsync for portability"), \
++ fsync (fd))
++#endif
++
++
++#if @GNULIB_FTRUNCATE@
++# if !@HAVE_FTRUNCATE@
++/* Change the size of the file to which FD is opened to become equal to LENGTH.
++ Return 0 if successful, otherwise -1 and errno set.
++ See the POSIX:2001 specification
++ <http://www.opengroup.org/susv3xsh/ftruncate.html>. */
++extern int ftruncate (int fd, off_t length);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef ftruncate
++# define ftruncate(f,l) \
++ (GL_LINK_WARNING ("ftruncate is unportable - " \
++ "use gnulib module ftruncate for portability"), \
++ ftruncate (f, l))
++#endif
++
++
++#if @GNULIB_GETCWD@
++/* Include the headers that might declare getcwd so that they will not
++ cause confusion if included after this file. */
++# include <stdlib.h>
++# if @REPLACE_GETCWD@
++/* Get the name of the current working directory, and put it in SIZE bytes
++ of BUF.
++ Return BUF if successful, or NULL if the directory couldn't be determined
++ or SIZE was too small.
++ See the POSIX:2001 specification
++ <http://www.opengroup.org/susv3xsh/getcwd.html>.
++ Additionally, the gnulib module 'getcwd' guarantees the following GNU
++ extension: If BUF is NULL, an array is allocated with 'malloc'; the array
++ is SIZE bytes long, unless SIZE == 0, in which case it is as big as
++ necessary. */
++# define getcwd rpl_getcwd
++extern char * getcwd (char *buf, size_t size);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef getcwd
++# define getcwd(b,s) \
++ (GL_LINK_WARNING ("getcwd is unportable - " \
++ "use gnulib module getcwd for portability"), \
++ getcwd (b, s))
++#endif
++
++
++#if @GNULIB_GETDTABLESIZE@
++# if !@HAVE_GETDTABLESIZE@
++/* Return the maximum number of file descriptors in the current process. */
++extern int getdtablesize (void);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef getdtablesize
++# define getdtablesize() \
++ (GL_LINK_WARNING ("getdtablesize is unportable - " \
++ "use gnulib module getdtablesize for portability"), \
++ getdtablesize ())
++#endif
++
++
++#if @GNULIB_GETLOGIN_R@
++/* Copies the user's login name to NAME.
++ The array pointed to by NAME has room for SIZE bytes.
++
++ Returns 0 if successful. Upon error, an error number is returned, or -1 in
++ the case that the login name cannot be found but no specific error is
++ provided (this case is hopefully rare but is left open by the POSIX spec).
++
++ See <http://www.opengroup.org/susv3xsh/getlogin.html>.
++ */
++# if !@HAVE_DECL_GETLOGIN_R@
++# include <stddef.h>
++extern int getlogin_r (char *name, size_t size);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef getlogin_r
++# define getlogin_r(n,s) \
++ (GL_LINK_WARNING ("getlogin_r is unportable - " \
++ "use gnulib module getlogin_r for portability"), \
++ getlogin_r (n, s))
++#endif
++
++
++#if @GNULIB_GETPAGESIZE@
++# if @REPLACE_GETPAGESIZE@
++# define getpagesize rpl_getpagesize
++extern int getpagesize (void);
++# elif !@HAVE_GETPAGESIZE@
++/* This is for POSIX systems. */
++# if !defined getpagesize && defined _SC_PAGESIZE
++# if ! (defined __VMS && __VMS_VER < 70000000)
++# define getpagesize() sysconf (_SC_PAGESIZE)
++# endif
++# endif
++/* This is for older VMS. */
++# if !defined getpagesize && defined __VMS
++# ifdef __ALPHA
++# define getpagesize() 8192
++# else
++# define getpagesize() 512
++# endif
++# endif
++/* This is for BeOS. */
++# if !defined getpagesize && @HAVE_OS_H@
++# include <OS.h>
++# if defined B_PAGE_SIZE
++# define getpagesize() B_PAGE_SIZE
++# endif
++# endif
++/* This is for AmigaOS4.0. */
++# if !defined getpagesize && defined __amigaos4__
++# define getpagesize() 2048
++# endif
++/* This is for older Unix systems. */
++# if !defined getpagesize && @HAVE_SYS_PARAM_H@
++# include <sys/param.h>
++# ifdef EXEC_PAGESIZE
++# define getpagesize() EXEC_PAGESIZE
++# else
++# ifdef NBPG
++# ifndef CLSIZE
++# define CLSIZE 1
++# endif
++# define getpagesize() (NBPG * CLSIZE)
++# else
++# ifdef NBPC
++# define getpagesize() NBPC
++# endif
++# endif
++# endif
++# endif
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef getpagesize
++# define getpagesize() \
++ (GL_LINK_WARNING ("getpagesize is unportable - " \
++ "use gnulib module getpagesize for portability"), \
++ getpagesize ())
++#endif
++
++
++#if @GNULIB_LCHOWN@
++# if @REPLACE_LCHOWN@
++/* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
++ to GID (if GID is not -1). Do not follow symbolic links.
++ Return 0 if successful, otherwise -1 and errno set.
++ See the POSIX:2001 specification
++ <http://www.opengroup.org/susv3xsh/lchown.html>. */
++# define lchown rpl_lchown
++extern int lchown (char const *file, uid_t owner, gid_t group);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef lchown
++# define lchown(f,u,g) \
++ (GL_LINK_WARNING ("lchown is unportable to pre-POSIX.1-2001 " \
++ "systems - use gnulib module lchown for portability"), \
++ lchown (f, u, g))
++#endif
++
++
++#if @GNULIB_LSEEK@
++# if @REPLACE_LSEEK@
++/* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END.
++ Return the new offset if successful, otherwise -1 and errno set.
++ See the POSIX:2001 specification
++ <http://www.opengroup.org/susv3xsh/lseek.html>. */
++# define lseek rpl_lseek
++ extern off_t lseek (int fd, off_t offset, int whence);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef lseek
++# define lseek(f,o,w) \
++ (GL_LINK_WARNING ("lseek does not fail with ESPIPE on pipes on some " \
++ "systems - use gnulib module lseek for portability"), \
++ lseek (f, o, w))
++#endif
++
++
++#if @GNULIB_READLINK@
++/* Read the contents of the symbolic link FILE and place the first BUFSIZE
++ bytes of it into BUF. Return the number of bytes placed into BUF if
++ successful, otherwise -1 and errno set.
++ See the POSIX:2001 specification
++ <http://www.opengroup.org/susv3xsh/readlink.html>. */
++# if !@HAVE_READLINK@
++# include <stddef.h>
++extern int readlink (const char *file, char *buf, size_t bufsize);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef readlink
++# define readlink(f,b,s) \
++ (GL_LINK_WARNING ("readlink is unportable - " \
++ "use gnulib module readlink for portability"), \
++ readlink (f, b, s))
++#endif
++
++
++#if @GNULIB_SLEEP@
++/* Pause the execution of the current thread for N seconds.
++ Returns the number of seconds left to sleep.
++ See the POSIX:2001 specification
++ <http://www.opengroup.org/susv3xsh/sleep.html>. */
++# if !@HAVE_SLEEP@
++extern unsigned int sleep (unsigned int n);
++# endif
++#elif defined GNULIB_POSIXCHECK
++# undef sleep
++# define sleep(n) \
++ (GL_LINK_WARNING ("sleep is unportable - " \
++ "use gnulib module sleep for portability"), \
++ sleep (n))
++#endif
++
++
++#if @GNULIB_WRITE@ && @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@
++/* Write up to COUNT bytes starting at BUF to file descriptor FD.
++ See the POSIX:2001 specification
++ <http://www.opengroup.org/susv3xsh/write.html>. */
++# undef write
++# define write rpl_write
++extern ssize_t write (int fd, const void *buf, size_t count);
++#endif
++
++
++#ifdef __cplusplus
++}
++#endif
++
++
++#endif /* _GL_UNISTD_H */
++#endif /* _GL_UNISTD_H */
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/vasnprintf.c gtk-vnc-0.3.7.gnulib/gnulib/lib/vasnprintf.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/vasnprintf.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/vasnprintf.c 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,4887 @@
+/* vsprintf with automatic memory allocation.
+ Copyright (C) 1999, 2002-2008 Free Software Foundation, Inc.
+#undef DCHAR_T
+#undef FCHAR_T
+#undef VASNPRINTF
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/vasnprintf.h gtk-vnc-0.3.7.gnulib/gnulib/lib/vasnprintf.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/vasnprintf.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/vasnprintf.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/vasnprintf.h gtk-vnc-0.3.7.gnulib/gnulib/lib/vasnprintf.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/vasnprintf.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/vasnprintf.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,81 @@
+/* vsprintf with automatic memory allocation.
+ Copyright (C) 2002-2004, 2007-2008 Free Software Foundation, Inc.
+#endif
+
+#endif /* _VASNPRINTF_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/wchar.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/wchar.in.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/wchar.in.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/wchar.in.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/wchar.in.h gtk-vnc-0.3.7.gnulib/gnulib/lib/wchar.in.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/wchar.in.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/wchar.in.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,99 @@
+/* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+
+#endif /* _GL_WCHAR_H */
+#endif /* _GL_WCHAR_H */
+#endif
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/winsock.c gtk-vnc-0.3.7.gnulib/gnulib/lib/winsock.c
---- gtk-vnc-0.3.7.mingw/gnulib/lib/winsock.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/winsock.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/winsock.c gtk-vnc-0.3.7.gnulib/gnulib/lib/winsock.c
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/winsock.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/winsock.c 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,308 @@
+/* winsock.c --- wrappers for Windows socket functions
+
+ return r;
+}
+#endif
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/lib/xsize.h gtk-vnc-0.3.7.gnulib/gnulib/lib/xsize.h
---- gtk-vnc-0.3.7.mingw/gnulib/lib/xsize.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/lib/xsize.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/lib/xsize.h gtk-vnc-0.3.7.gnulib/gnulib/lib/xsize.h
+--- gtk-vnc-0.3.7.dan3/gnulib/lib/xsize.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/lib/xsize.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,108 @@
+/* xsize.h -- Checked size_t computations.
+
+ ((SIZE) != SIZE_MAX)
+
+#endif /* _XSIZE_H */
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/alloca.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/alloca.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/alloca.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/alloca.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/alloca.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/alloca.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/alloca.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/alloca.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,46 @@
+# alloca.m4 serial 8
+dnl Copyright (C) 2002-2004, 2006, 2007 Free Software Foundation, Inc.
+# Prerequisites of lib/alloca.c.
+# STACK_DIRECTION is already handled by AC_FUNC_ALLOCA.
+AC_DEFUN([gl_PREREQ_ALLOCA], [:])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/arpa_inet_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/arpa_inet_h.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/arpa_inet_h.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/arpa_inet_h.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/arpa_inet_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/arpa_inet_h.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/arpa_inet_h.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/arpa_inet_h.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,50 @@
+# arpa_inet_h.m4 serial 5
+dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+ HAVE_DECL_INET_PTON=1; AC_SUBST([HAVE_DECL_INET_PTON])
+ ARPA_INET_H=''; AC_SUBST([ARPA_INET_H])
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/errno_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/errno_h.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/errno_h.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/errno_h.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/errno_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/errno_h.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/errno_h.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/errno_h.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,113 @@
+# errno_h.m4 serial 1
+dnl Copyright (C) 2004, 2006, 2008 Free Software Foundation, Inc.
+ AC_SUBST($1[_VALUE])
+ fi
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/extensions.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/extensions.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/extensions.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/extensions.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/extensions.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/extensions.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/extensions.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/extensions.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,82 @@
+# serial 5 -*- Autoconf -*-
+# Enable extensions on systems that normally disable them.
+# typically due to standards-conformance issues.
+AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS],
+ [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/float_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/float_h.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/float_h.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/float_h.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/float_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/float_h.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/float_h.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/float_h.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,19 @@
+# float_h.m4 serial 3
+dnl Copyright (C) 2007 Free Software Foundation, Inc.
+ esac
+ AC_SUBST([FLOAT_H])
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/getaddrinfo.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/getaddrinfo.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/getaddrinfo.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/getaddrinfo.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/getaddrinfo.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/getaddrinfo.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/getaddrinfo.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/getaddrinfo.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,130 @@
+# getaddrinfo.m4 serial 15
+dnl Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
-+#endif
-+])
-+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-cache.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-cache.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-cache.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-cache.m4 2008-10-09 12:33:42.000000000 +0100
-@@ -0,0 +1,42 @@
-+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License. As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# Generated by gnulib-tool.
-+#
-+# This file represents the specification of how gnulib-tool is used.
-+# It acts as a cache: It is written and read by gnulib-tool.
-+# In projects using CVS, this file is meant to be stored in CVS,
-+# like the configure.ac and various Makefile.am files.
-+
-+
-+# Specification in the form of a command-line invocation:
-+# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=gnulib/tests --aux-dir=. --with-tests --lgpl=2 --libtool --macro-prefix=gl connect getaddrinfo recv send socket vc-list-files
-+
-+# Specification in the form of a few gnulib-tool.m4 macro invocations:
-+gl_LOCAL_DIR([])
-+gl_MODULES([
-+ connect
-+ getaddrinfo
-+ recv
-+ send
-+ socket
-+ vc-list-files
-+])
-+gl_AVOID([])
-+gl_SOURCE_BASE([gnulib/lib])
-+gl_M4_BASE([gnulib/m4])
-+gl_PO_BASE([])
-+gl_DOC_BASE([doc])
-+gl_TESTS_BASE([gnulib/tests])
-+gl_WITH_TESTS
-+gl_LIB([libgnu])
-+gl_LGPL([2])
-+gl_MAKEFILE_NAME([])
-+gl_LIBTOOL
-+gl_MACRO_PREFIX([gl])
-+gl_PO_DOMAIN([])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-cache.m4~ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-cache.m4~
---- gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-cache.m4~ 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-cache.m4~ 2008-10-09 12:24:40.000000000 +0100
-@@ -0,0 +1,38 @@
++#endif
++])
++])
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/gnulib-cache.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-cache.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/gnulib-cache.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-cache.m4 2008-10-09 15:24:53.000000000 +0100
+@@ -0,0 +1,43 @@
+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+
+
+# Specification in the form of a command-line invocation:
-+# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=gnulib/tests --aux-dir=. --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo vc-list-files
++# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=gnulib/tests --aux-dir=. --with-tests --lgpl=2 --libtool --macro-prefix=gl connect getaddrinfo malloc recv send socket vc-list-files
+
+# Specification in the form of a few gnulib-tool.m4 macro invocations:
+gl_LOCAL_DIR([])
+gl_MODULES([
++ connect
+ getaddrinfo
++ malloc
++ recv
++ send
++ socket
+ vc-list-files
+])
+gl_AVOID([])
+gl_LIBTOOL
+gl_MACRO_PREFIX([gl])
+gl_PO_DOMAIN([])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-common.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-common.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-common.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-common.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/gnulib-common.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-common.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/gnulib-common.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-common.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,91 @@
+# gnulib-common.m4 serial 5
+dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
+[AC_CACHE_CHECK([for C/C++ restrict keyword], ac_cv_c_restrict,
+ [ac_cv_c_restrict=no
+ # The order here caters to the fact that C++ does not require restrict.
-+ for ac_kw in __restrict __restrict__ _Restrict restrict; do
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-+ [[typedef int * int_ptr;
-+ int foo (int_ptr $ac_kw ip) {
-+ return ip[0];
-+ }]],
-+ [[int s[1];
-+ int * $ac_kw t = s;
-+ t[0] = 0;
-+ return foo(t)]])],
-+ [ac_cv_c_restrict=$ac_kw])
-+ test "$ac_cv_c_restrict" != no && break
-+ done
-+ ])
-+ AH_VERBATIM([restrict],
-+[/* Define to the equivalent of the C99 'restrict' keyword, or to
-+ nothing if this is not supported. Do not define if restrict is
-+ supported directly. */
-+#undef restrict
-+/* Work around a bug in Sun C++: it does not support _Restrict, even
-+ though the corresponding Sun C compiler does, which causes
-+ "#define restrict _Restrict" in the previous line. Perhaps some future
-+ version of Sun C++ will work with _Restrict; if so, it'll probably
-+ define __RESTRICT, just as Sun C does. */
-+#if defined __SUNPRO_CC && !defined __RESTRICT
-+# define _Restrict
-+#endif])
-+ case $ac_cv_c_restrict in
-+ restrict) ;;
-+ no) AC_DEFINE([restrict], []) ;;
-+ *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
-+ esac
-+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-comp.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-comp.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-comp.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-comp.m4 2008-10-09 12:33:42.000000000 +0100
-@@ -0,0 +1,300 @@
-+# DO NOT EDIT! GENERATED AUTOMATICALLY!
-+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License. As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# Generated by gnulib-tool.
-+#
-+# This file represents the compiled summary of the specification in
-+# gnulib-cache.m4. It lists the computed macro invocations that need
-+# to be invoked from configure.ac.
-+# In projects using CVS, this file can be treated like other built files.
-+
-+
-+# This macro should be invoked from ./configure.ac, in the section
-+# "Checks for programs", right after AC_PROG_CC, and certainly before
-+# any checks for libraries, header files, types and library functions.
-+AC_DEFUN([gl_EARLY],
-+[
-+ m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
-+ m4_pattern_allow([^gl_ES$])dnl a valid locale name
-+ m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
-+ m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-+ AC_REQUIRE([AC_PROG_RANLIB])
-+ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-+])
-+
-+# This macro should be invoked from ./configure.ac, in the section
-+# "Check for header files, types and library functions".
-+AC_DEFUN([gl_INIT],
-+[
-+ AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
-+ gl_cond_libtool=true
-+ m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
-+ m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
-+ m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
-+ m4_pushdef([gl_LIBSOURCES_LIST], [])
-+ m4_pushdef([gl_LIBSOURCES_DIR], [])
-+ gl_COMMON
-+ gl_source_base='gnulib/lib'
-+ gl_FUNC_ALLOCA
-+ gl_HEADER_ARPA_INET
-+ AC_PROG_MKDIR_P
-+ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
-+ if test "$ac_cv_header_winsock2_h" = yes; then
-+ AC_LIBOBJ([winsock])
-+ fi
-+ gl_SYS_SOCKET_MODULE_INDICATOR([connect])
-+ gl_HEADER_ERRNO_H
-+ gl_FLOAT_H
-+ gl_GETADDRINFO
-+ AC_SUBST([LIBINTL])
-+ AC_SUBST([LTLIBINTL])
-+ gl_INET_NTOP
-+ gl_ARPA_INET_MODULE_INDICATOR([inet_ntop])
-+ gl_HEADER_NETINET_IN
-+ AC_PROG_MKDIR_P
-+ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
-+ if test "$ac_cv_header_winsock2_h" = yes; then
-+ AC_LIBOBJ([winsock])
-+ fi
-+ gl_SYS_SOCKET_MODULE_INDICATOR([recv])
-+ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
-+ if test "$ac_cv_header_winsock2_h" = yes; then
-+ AC_LIBOBJ([winsock])
-+ fi
-+ gl_SYS_SOCKET_MODULE_INDICATOR([send])
-+ gl_SIZE_MAX
-+ gl_FUNC_SNPRINTF
-+ gl_STDIO_MODULE_INDICATOR([snprintf])
-+ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
-+ if test "$ac_cv_header_winsock2_h" = yes; then
-+ AC_LIBOBJ([winsock])
-+ fi
-+ gl_SYS_SOCKET_MODULE_INDICATOR([socket])
-+ gl_TYPE_SOCKLEN_T
-+ AM_STDBOOL_H
-+ gl_STDINT_H
-+ gl_STDIO_H
-+ gl_HEADER_SYS_SOCKET
-+ AC_PROG_MKDIR_P
-+ gl_FUNC_VASNPRINTF
-+ gl_WCHAR_H
-+ gl_XSIZE
-+ m4_ifval(gl_LIBSOURCES_LIST, [
-+ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
-+ for gl_file in ]gl_LIBSOURCES_LIST[ ; do
-+ if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then
-+ echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2
-+ exit 1
-+ fi
-+ done])dnl
-+ m4_if(m4_sysval, [0], [],
-+ [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
-+ ])
-+ m4_popdef([gl_LIBSOURCES_DIR])
-+ m4_popdef([gl_LIBSOURCES_LIST])
-+ m4_popdef([AC_LIBSOURCES])
-+ m4_popdef([AC_REPLACE_FUNCS])
-+ m4_popdef([AC_LIBOBJ])
-+ AC_CONFIG_COMMANDS_PRE([
-+ gl_libobjs=
-+ gl_ltlibobjs=
-+ if test -n "$gl_LIBOBJS"; then
-+ # Remove the extension.
-+ sed_drop_objext='s/\.o$//;s/\.obj$//'
-+ for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
-+ gl_libobjs="$gl_libobjs $i.$ac_objext"
-+ gl_ltlibobjs="$gl_ltlibobjs $i.lo"
-+ done
-+ fi
-+ AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
-+ AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
-+ ])
-+ gltests_libdeps=
-+ gltests_ltlibdeps=
-+ m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ]))
-+ m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS]))
-+ m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES]))
-+ m4_pushdef([gltests_LIBSOURCES_LIST], [])
-+ m4_pushdef([gltests_LIBSOURCES_DIR], [])
-+ gl_COMMON
-+ gl_source_base='gnulib/tests'
-+ gt_TYPE_WCHAR_T
-+ gt_TYPE_WINT_T
-+ AC_CHECK_FUNCS([shutdown])
-+ abs_aux_dir=`cd "$ac_aux_dir"; pwd`
-+ AC_SUBST([abs_aux_dir])
-+ m4_ifval(gltests_LIBSOURCES_LIST, [
-+ m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
-+ for gl_file in ]gltests_LIBSOURCES_LIST[ ; do
-+ if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then
-+ echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2
-+ exit 1
-+ fi
-+ done])dnl
-+ m4_if(m4_sysval, [0], [],
-+ [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
-+ ])
-+ m4_popdef([gltests_LIBSOURCES_DIR])
-+ m4_popdef([gltests_LIBSOURCES_LIST])
-+ m4_popdef([AC_LIBSOURCES])
-+ m4_popdef([AC_REPLACE_FUNCS])
-+ m4_popdef([AC_LIBOBJ])
-+ AC_CONFIG_COMMANDS_PRE([
-+ gltests_libobjs=
-+ gltests_ltlibobjs=
-+ if test -n "$gltests_LIBOBJS"; then
-+ # Remove the extension.
-+ sed_drop_objext='s/\.o$//;s/\.obj$//'
-+ for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
-+ gltests_libobjs="$gltests_libobjs $i.$ac_objext"
-+ gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
-+ done
-+ fi
-+ AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs])
-+ AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs])
-+ ])
-+ LIBTESTS_LIBDEPS="$gltests_libdeps"
-+ AC_SUBST([LIBTESTS_LIBDEPS])
-+])
-+
-+# Like AC_LIBOBJ, except that the module name goes
-+# into gl_LIBOBJS instead of into LIBOBJS.
-+AC_DEFUN([gl_LIBOBJ], [
-+ AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
-+ gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
-+])
-+
-+# Like AC_REPLACE_FUNCS, except that the module name goes
-+# into gl_LIBOBJS instead of into LIBOBJS.
-+AC_DEFUN([gl_REPLACE_FUNCS], [
-+ m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
-+ AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
-+])
-+
-+# Like AC_LIBSOURCES, except the directory where the source file is
-+# expected is derived from the gnulib-tool parameterization,
-+# and alloca is special cased (for the alloca-opt module).
-+# We could also entirely rely on EXTRA_lib..._SOURCES.
-+AC_DEFUN([gl_LIBSOURCES], [
-+ m4_foreach([_gl_NAME], [$1], [
-+ m4_if(_gl_NAME, [alloca.c], [], [
-+ m4_define([gl_LIBSOURCES_DIR], [gnulib/lib])
-+ m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
-+ ])
-+ ])
-+])
-+
-+# Like AC_LIBOBJ, except that the module name goes
-+# into gltests_LIBOBJS instead of into LIBOBJS.
-+AC_DEFUN([gltests_LIBOBJ], [
-+ AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl
-+ gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext"
-+])
-+
-+# Like AC_REPLACE_FUNCS, except that the module name goes
-+# into gltests_LIBOBJS instead of into LIBOBJS.
-+AC_DEFUN([gltests_REPLACE_FUNCS], [
-+ m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
-+ AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)])
-+])
-+
-+# Like AC_LIBSOURCES, except the directory where the source file is
-+# expected is derived from the gnulib-tool parameterization,
-+# and alloca is special cased (for the alloca-opt module).
-+# We could also entirely rely on EXTRA_lib..._SOURCES.
-+AC_DEFUN([gltests_LIBSOURCES], [
-+ m4_foreach([_gl_NAME], [$1], [
-+ m4_if(_gl_NAME, [alloca.c], [], [
-+ m4_define([gltests_LIBSOURCES_DIR], [gnulib/tests])
-+ m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ])
-+ ])
++ for ac_kw in __restrict __restrict__ _Restrict restrict; do
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
++ [[typedef int * int_ptr;
++ int foo (int_ptr $ac_kw ip) {
++ return ip[0];
++ }]],
++ [[int s[1];
++ int * $ac_kw t = s;
++ t[0] = 0;
++ return foo(t)]])],
++ [ac_cv_c_restrict=$ac_kw])
++ test "$ac_cv_c_restrict" != no && break
++ done
+ ])
++ AH_VERBATIM([restrict],
++[/* Define to the equivalent of the C99 'restrict' keyword, or to
++ nothing if this is not supported. Do not define if restrict is
++ supported directly. */
++#undef restrict
++/* Work around a bug in Sun C++: it does not support _Restrict, even
++ though the corresponding Sun C compiler does, which causes
++ "#define restrict _Restrict" in the previous line. Perhaps some future
++ version of Sun C++ will work with _Restrict; if so, it'll probably
++ define __RESTRICT, just as Sun C does. */
++#if defined __SUNPRO_CC && !defined __RESTRICT
++# define _Restrict
++#endif])
++ case $ac_cv_c_restrict in
++ restrict) ;;
++ no) AC_DEFINE([restrict], []) ;;
++ *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
++ esac
+])
-+
-+# This macro records the list of files which have been installed by
-+# gnulib-tool and may be removed by future gnulib-tool invocations.
-+AC_DEFUN([gl_FILE_LIST], [
-+ build-aux/link-warning.h
-+ build-aux/vc-list-files
-+ lib/alloca.in.h
-+ lib/arpa_inet.in.h
-+ lib/asnprintf.c
-+ lib/dummy.c
-+ lib/errno.in.h
-+ lib/float+.h
-+ lib/float.in.h
-+ lib/gai_strerror.c
-+ lib/getaddrinfo.c
-+ lib/getaddrinfo.h
-+ lib/gettext.h
-+ lib/inet_ntop.c
-+ lib/netinet_in.in.h
-+ lib/printf-args.c
-+ lib/printf-args.h
-+ lib/printf-parse.c
-+ lib/printf-parse.h
-+ lib/size_max.h
-+ lib/snprintf.c
-+ lib/stdbool.in.h
-+ lib/stdint.in.h
-+ lib/stdio-write.c
-+ lib/stdio.in.h
-+ lib/sys_socket.in.h
-+ lib/vasnprintf.c
-+ lib/vasnprintf.h
-+ lib/wchar.in.h
-+ lib/winsock.c
-+ lib/xsize.h
-+ m4/alloca.m4
-+ m4/arpa_inet_h.m4
-+ m4/errno_h.m4
-+ m4/extensions.m4
-+ m4/float_h.m4
-+ m4/getaddrinfo.m4
-+ m4/gnulib-common.m4
-+ m4/include_next.m4
-+ m4/inet_ntop.m4
-+ m4/intmax_t.m4
-+ m4/inttypes_h.m4
-+ m4/longlong.m4
-+ m4/netinet_in_h.m4
-+ m4/onceonly.m4
-+ m4/printf.m4
-+ m4/size_max.m4
-+ m4/snprintf.m4
-+ m4/socklen.m4
-+ m4/sockpfaf.m4
-+ m4/stdbool.m4
-+ m4/stdint.m4
-+ m4/stdint_h.m4
-+ m4/stdio_h.m4
-+ m4/sys_socket_h.m4
-+ m4/vasnprintf.m4
-+ m4/wchar.m4
-+ m4/wchar_t.m4
-+ m4/wint_t.m4
-+ m4/xsize.m4
-+ tests/test-alloca-opt.c
-+ tests/test-arpa_inet.c
-+ tests/test-errno.c
-+ tests/test-getaddrinfo.c
-+ tests/test-netinet_in.c
-+ tests/test-snprintf.c
-+ tests/test-stdbool.c
-+ tests/test-stdint.c
-+ tests/test-stdio.c
-+ tests/test-sys_socket.c
-+ tests/test-vasnprintf.c
-+ tests/test-vc-list-files-cvs.sh
-+ tests/test-vc-list-files-git.sh
-+ tests/test-wchar.c
-+ tests=lib/dummy.c
-+ tests=lib/intprops.h
-+ tests=lib/verify.h
-+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-comp.m4~ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-comp.m4~
---- gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-comp.m4~ 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-comp.m4~ 2008-10-09 12:24:40.000000000 +0100
-@@ -0,0 +1,280 @@
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/gnulib-comp.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-comp.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/gnulib-comp.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-comp.m4 2008-10-09 15:24:54.000000000 +0100
+@@ -0,0 +1,314 @@
+# DO NOT EDIT! GENERATED AUTOMATICALLY!
+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
+#
+ gl_FUNC_ALLOCA
+ gl_HEADER_ARPA_INET
+ AC_PROG_MKDIR_P
++ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
++ if test "$ac_cv_header_winsock2_h" = yes; then
++ AC_LIBOBJ([winsock])
++ fi
++ gl_SYS_SOCKET_MODULE_INDICATOR([connect])
+ gl_HEADER_ERRNO_H
+ gl_FLOAT_H
+ gl_GETADDRINFO
+ AC_SUBST([LTLIBINTL])
+ gl_INET_NTOP
+ gl_ARPA_INET_MODULE_INDICATOR([inet_ntop])
++ AC_FUNC_MALLOC
++ AC_DEFINE([GNULIB_MALLOC_GNU], 1, [Define to indicate the 'malloc' module.])
++ gl_FUNC_MALLOC_POSIX
++ gl_STDLIB_MODULE_INDICATOR([malloc-posix])
+ gl_HEADER_NETINET_IN
+ AC_PROG_MKDIR_P
++ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
++ if test "$ac_cv_header_winsock2_h" = yes; then
++ AC_LIBOBJ([winsock])
++ fi
++ gl_SYS_SOCKET_MODULE_INDICATOR([recv])
++ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
++ if test "$ac_cv_header_winsock2_h" = yes; then
++ AC_LIBOBJ([winsock])
++ fi
++ gl_SYS_SOCKET_MODULE_INDICATOR([send])
+ gl_SIZE_MAX
+ gl_FUNC_SNPRINTF
+ gl_STDIO_MODULE_INDICATOR([snprintf])
++ AC_REQUIRE([gl_HEADER_SYS_SOCKET])
++ if test "$ac_cv_header_winsock2_h" = yes; then
++ AC_LIBOBJ([winsock])
++ fi
++ gl_SYS_SOCKET_MODULE_INDICATOR([socket])
+ gl_TYPE_SOCKLEN_T
+ AM_STDBOOL_H
+ gl_STDINT_H
+ gl_STDIO_H
++ gl_STDLIB_H
+ gl_HEADER_SYS_SOCKET
+ AC_PROG_MKDIR_P
++ gl_UNISTD_H
+ gl_FUNC_VASNPRINTF
+ gl_WCHAR_H
+ gl_XSIZE
+ lib/getaddrinfo.h
+ lib/gettext.h
+ lib/inet_ntop.c
++ lib/malloc.c
+ lib/netinet_in.in.h
+ lib/printf-args.c
+ lib/printf-args.h
+ lib/stdint.in.h
+ lib/stdio-write.c
+ lib/stdio.in.h
++ lib/stdlib.in.h
+ lib/sys_socket.in.h
++ lib/unistd.in.h
+ lib/vasnprintf.c
+ lib/vasnprintf.h
+ lib/wchar.in.h
+ m4/intmax_t.m4
+ m4/inttypes_h.m4
+ m4/longlong.m4
++ m4/malloc.m4
+ m4/netinet_in_h.m4
+ m4/onceonly.m4
+ m4/printf.m4
+ m4/stdint.m4
+ m4/stdint_h.m4
+ m4/stdio_h.m4
++ m4/stdlib_h.m4
+ m4/sys_socket_h.m4
++ m4/unistd_h.m4
+ m4/vasnprintf.m4
+ m4/wchar.m4
+ m4/wchar_t.m4
+ tests/test-stdbool.c
+ tests/test-stdint.c
+ tests/test-stdio.c
++ tests/test-stdlib.c
+ tests/test-sys_socket.c
++ tests/test-unistd.c
+ tests/test-vasnprintf.c
+ tests/test-vc-list-files-cvs.sh
+ tests/test-vc-list-files-git.sh
+ tests=lib/intprops.h
+ tests=lib/verify.h
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-tool.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-tool.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/gnulib-tool.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-tool.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/gnulib-tool.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-tool.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/gnulib-tool.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/gnulib-tool.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,57 @@
+# gnulib-tool.m4 serial 2
+dnl Copyright (C) 2004-2005 Free Software Foundation, Inc.
+
+dnl Usage: gl_VC_FILES([BOOLEAN])
+AC_DEFUN([gl_VC_FILES], [])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/include_next.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/include_next.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/include_next.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/include_next.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/include_next.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/include_next.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/include_next.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/include_next.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,128 @@
+# include_next.m4 serial 8
+dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
+ [AS_VAR_GET([gl_next_header])])
+ AS_VAR_POPDEF([gl_next_header])])
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/inet_ntop.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/inet_ntop.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/inet_ntop.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/inet_ntop.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/inet_ntop.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/inet_ntop.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/inet_ntop.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/inet_ntop.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,26 @@
+# inet_ntop.m4 serial 7
+dnl Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
+ AC_REQUIRE([gl_SOCKET_FAMILIES])
+ AC_REQUIRE([AC_C_RESTRICT])
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/intmax_t.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/intmax_t.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/intmax_t.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/intmax_t.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/intmax_t.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/intmax_t.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/intmax_t.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/intmax_t.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,61 @@
+# intmax_t.m4 serial 6
+dnl Copyright (C) 1997-2004, 2006-2007 Free Software Foundation, Inc.
+ [Define to long or long long if <stdint.h> and <inttypes.h> don't define.])
+ fi
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/inttypes_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/inttypes_h.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/inttypes_h.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/inttypes_h.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/inttypes_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/inttypes_h.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/inttypes_h.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/inttypes_h.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,26 @@
+# inttypes_h.m4 serial 7
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
+ and declares uintmax_t. ])
+ fi
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/longlong.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/longlong.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/longlong.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/longlong.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/longlong.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/longlong.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/longlong.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/longlong.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,106 @@
+# longlong.m4 serial 13
+dnl Copyright (C) 1999-2007 Free Software Foundation, Inc.
+ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+ | (ullmax / ull) | (ullmax % ull));]])
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/netinet_in_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/netinet_in_h.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/netinet_in_h.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/netinet_in_h.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/malloc.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/malloc.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/malloc.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/malloc.m4 2008-10-09 15:24:52.000000000 +0100
+@@ -0,0 +1,41 @@
++# malloc.m4 serial 8
++dnl Copyright (C) 2007 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++# gl_FUNC_MALLOC_POSIX
++# --------------------
++# Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it
++# fails), and replace malloc if it is not.
++AC_DEFUN([gl_FUNC_MALLOC_POSIX],
++[
++ AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
++ if test $gl_cv_func_malloc_posix = yes; then
++ HAVE_MALLOC_POSIX=1
++ AC_DEFINE([HAVE_MALLOC_POSIX], 1,
++ [Define if the 'malloc' function is POSIX compliant.])
++ else
++ AC_LIBOBJ([malloc])
++ HAVE_MALLOC_POSIX=0
++ fi
++ AC_SUBST([HAVE_MALLOC_POSIX])
++])
++
++# Test whether malloc, realloc, calloc are POSIX compliant,
++# Set gl_cv_func_malloc_posix to yes or no accordingly.
++AC_DEFUN([gl_CHECK_MALLOC_POSIX],
++[
++ AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant],
++ [gl_cv_func_malloc_posix],
++ [
++ dnl It is too dangerous to try to allocate a large amount of memory:
++ dnl some systems go to their knees when you do that. So assume that
++ dnl all Unix implementations of the function are POSIX compliant.
++ AC_TRY_COMPILE([],
++ [#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
++ choke me
++ #endif
++ ], [gl_cv_func_malloc_posix=yes], [gl_cv_func_malloc_posix=no])
++ ])
++])
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/netinet_in_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/netinet_in_h.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/netinet_in_h.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/netinet_in_h.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,30 @@
+# netinet_in_h.m4 serial 4
+dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
+ fi
+ AC_SUBST([NETINET_IN_H])
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/onceonly.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/onceonly.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/onceonly.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/onceonly.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/onceonly.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/onceonly.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/onceonly.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/onceonly.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,90 @@
+# onceonly.m4 serial 6
+dnl Copyright (C) 2002-2003, 2005-2006, 2008 Free Software Foundation, Inc.
+ AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
+ ])
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/printf.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/printf.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/printf.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/printf.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/printf.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/printf.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/printf.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/printf.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,1309 @@
+# printf.m4 serial 23
+dnl Copyright (C) 2003, 2007-2008 Free Software Foundation, Inc.
+dnl NetBSD 3.0 . . . . # # . # # ? # . # . . . . . .
+dnl BeOS # # . # # # . # . ? . # ? . . . . . .
+dnl mingw # # # # # # . # # . # # ? . # # # . .
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/size_max.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/size_max.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/size_max.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/size_max.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/size_max.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/size_max.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/size_max.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/size_max.m4 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,68 @@
+# size_max.m4 serial 6
+dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
+m4_ifdef([AC_COMPUTE_INT], [], [
+ AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/snprintf.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/snprintf.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/snprintf.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/snprintf.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/snprintf.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/snprintf.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/snprintf.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/snprintf.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,40 @@
+# snprintf.m4 serial 5
+dnl Copyright (C) 2002-2004, 2007-2008 Free Software Foundation, Inc.
+
+# Prerequisites of lib/snprintf.c.
+AC_DEFUN([gl_PREREQ_SNPRINTF], [:])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/socklen.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/socklen.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/socklen.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/socklen.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/socklen.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/socklen.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/socklen.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/socklen.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,52 @@
+# socklen.m4 serial 6
+dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ #elif HAVE_WS2TCPIP_H
+ # include <ws2tcpip.h>
+ #endif])])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/sockpfaf.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/sockpfaf.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/sockpfaf.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/sockpfaf.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/sockpfaf.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/sockpfaf.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/sockpfaf.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/sockpfaf.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,58 @@
+# sockpfaf.m4 serial 5
+dnl Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+ AC_DEFINE(HAVE_IPV6, 1, [Define to 1 if <sys/socket.h> defines AF_INET6.])
+ fi
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/stdbool.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/stdbool.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/stdbool.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/stdbool.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/stdbool.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/stdbool.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/stdbool.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/stdbool.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,115 @@
+# Check for stdbool.h that conforms to C99.
+
+ if test $ac_cv_header_stdbool_h = yes; then
+ AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.])
+ fi])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/stdint_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/stdint_h.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/stdint_h.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/stdint_h.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/stdint_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/stdint_h.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/stdint_h.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/stdint_h.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,26 @@
+# stdint_h.m4 serial 6
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
+ and declares uintmax_t. ])
+ fi
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/stdint.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/stdint.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/stdint.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/stdint.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/stdint.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/stdint.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/stdint.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/stdint.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,395 @@
+# stdint.m4 serial 31
+dnl Copyright (C) 2001-2008 Free Software Foundation, Inc.
+# Local Variables:
+# indent-tabs-mode: nil
+# End:
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/stdio_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/stdio_h.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/stdio_h.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/stdio_h.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/stdio_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/stdio_h.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/stdio_h.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/stdio_h.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,125 @@
+# stdio_h.m4 serial 13
+dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ [gl_cv_var_stdin_large_offset=yes],
+ [gl_cv_var_stdin_large_offset=no])])
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/sys_socket_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/sys_socket_h.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/sys_socket_h.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/sys_socket_h.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/stdlib_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/stdlib_h.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/stdlib_h.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/stdlib_h.m4 2008-10-09 15:24:53.000000000 +0100
+@@ -0,0 +1,47 @@
++# stdlib_h.m4 serial 7
++dnl Copyright (C) 2007, 2008 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++AC_DEFUN([gl_STDLIB_H],
++[
++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
++ gl_CHECK_NEXT_HEADERS([stdlib.h])
++])
++
++AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
++[
++ dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
++ GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
++])
++
++AC_DEFUN([gl_STDLIB_H_DEFAULTS],
++[
++ GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX])
++ GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
++ GNULIB_CALLOC_POSIX=0; AC_SUBST([GNULIB_CALLOC_POSIX])
++ GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT])
++ GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP])
++ GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP])
++ GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV])
++ GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH])
++ GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV])
++ GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD])
++ GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV])
++ dnl Assume proper GNU behavior unless another module says otherwise.
++ HAVE_CALLOC_POSIX=1; AC_SUBST([HAVE_CALLOC_POSIX])
++ HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT])
++ HAVE_MALLOC_POSIX=1; AC_SUBST([HAVE_MALLOC_POSIX])
++ HAVE_MKDTEMP=1; AC_SUBST([HAVE_MKDTEMP])
++ HAVE_REALLOC_POSIX=1; AC_SUBST([HAVE_REALLOC_POSIX])
++ HAVE_RPMATCH=1; AC_SUBST([HAVE_RPMATCH])
++ HAVE_SETENV=1; AC_SUBST([HAVE_SETENV])
++ HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD])
++ HAVE_UNSETENV=1; AC_SUBST([HAVE_UNSETENV])
++ REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP])
++ REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV])
++ REPLACE_STRTOD=0; AC_SUBST([REPLACE_STRTOD])
++ VOID_UNSETENV=0; AC_SUBST([VOID_UNSETENV])
++])
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/sys_socket_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/sys_socket_h.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/sys_socket_h.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/sys_socket_h.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,113 @@
+# sys_socket_h.m4 serial 8
+dnl Copyright (C) 2005-2008 Free Software Foundation, Inc.
+ GNULIB_SENDTO=0; AC_SUBST([GNULIB_SENDTO])
+ GNULIB_SETSOCKOPT=0; AC_SUBST([GNULIB_SETSOCKOPT])
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/vasnprintf.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/vasnprintf.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/vasnprintf.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/vasnprintf.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/unistd_h.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/unistd_h.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/unistd_h.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/unistd_h.m4 2008-10-09 15:24:53.000000000 +0100
+@@ -0,0 +1,70 @@
++# unistd_h.m4 serial 13
++dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++dnl Written by Simon Josefsson, Bruno Haible.
++
++AC_DEFUN([gl_UNISTD_H],
++[
++ dnl Use AC_REQUIRE here, so that the default behavior below is expanded
++ dnl once only, before all statements that occur in other macros.
++ AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
++
++ gl_CHECK_NEXT_HEADERS([unistd.h])
++
++ AC_CHECK_HEADERS_ONCE([unistd.h])
++ if test $ac_cv_header_unistd_h = yes; then
++ HAVE_UNISTD_H=1
++ else
++ HAVE_UNISTD_H=0
++ fi
++ AC_SUBST([HAVE_UNISTD_H])
++])
++
++AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
++[
++ dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
++ AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
++ GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
++])
++
++AC_DEFUN([gl_UNISTD_H_DEFAULTS],
++[
++ GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN])
++ GNULIB_DUP2=0; AC_SUBST([GNULIB_DUP2])
++ GNULIB_ENVIRON=0; AC_SUBST([GNULIB_ENVIRON])
++ GNULIB_FCHDIR=0; AC_SUBST([GNULIB_FCHDIR])
++ GNULIB_FSYNC=0; AC_SUBST([GNULIB_FSYNC])
++ GNULIB_FTRUNCATE=0; AC_SUBST([GNULIB_FTRUNCATE])
++ GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD])
++ GNULIB_GETDTABLESIZE=0; AC_SUBST([GNULIB_GETDTABLESIZE])
++ GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R])
++ GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE])
++ GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN])
++ GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK])
++ GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK])
++ GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP])
++ GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE])
++ GNULIB_WRITE=0; AC_SUBST([GNULIB_WRITE])
++ dnl Assume proper GNU behavior unless another module says otherwise.
++ HAVE_DUP2=1; AC_SUBST([HAVE_DUP2])
++ HAVE_FSYNC=1; AC_SUBST([HAVE_FSYNC])
++ HAVE_FTRUNCATE=1; AC_SUBST([HAVE_FTRUNCATE])
++ HAVE_GETDTABLESIZE=1; AC_SUBST([HAVE_GETDTABLESIZE])
++ HAVE_GETPAGESIZE=1; AC_SUBST([HAVE_GETPAGESIZE])
++ HAVE_READLINK=1; AC_SUBST([HAVE_READLINK])
++ HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP])
++ HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON])
++ HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
++ HAVE_OS_H=0; AC_SUBST([HAVE_OS_H])
++ HAVE_SYS_PARAM_H=0; AC_SUBST([HAVE_SYS_PARAM_H])
++ REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN])
++ REPLACE_FCHDIR=0; AC_SUBST([REPLACE_FCHDIR])
++ REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD])
++ REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE])
++ REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN])
++ REPLACE_LSEEK=0; AC_SUBST([REPLACE_LSEEK])
++ REPLACE_WRITE=0; AC_SUBST([REPLACE_WRITE])
++])
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/vasnprintf.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/vasnprintf.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/vasnprintf.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/vasnprintf.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,260 @@
+# vasnprintf.m4 serial 25
+dnl Copyright (C) 2002-2004, 2006-2008 Free Software Foundation, Inc.
+AC_DEFUN([gl_PREREQ_ASNPRINTF],
+[
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/wchar.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/wchar.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/wchar.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/wchar.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/wchar.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/wchar.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/wchar.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/wchar.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,69 @@
+dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
+
+ REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH])
+ WCHAR_H=''; AC_SUBST([WCHAR_H])
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/wchar_t.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/wchar_t.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/wchar_t.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/wchar_t.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/wchar_t.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/wchar_t.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/wchar_t.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/wchar_t.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,20 @@
+# wchar_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+ AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
+ fi
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/wint_t.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/wint_t.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/wint_t.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/wint_t.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/wint_t.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/wint_t.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/wint_t.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/wint_t.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,28 @@
+# wint_t.m4 serial 2 (gettext-0.17)
+dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+ AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
+ fi
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/m4/xsize.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/xsize.m4
---- gtk-vnc-0.3.7.mingw/gnulib/m4/xsize.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/m4/xsize.m4 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/m4/xsize.m4 gtk-vnc-0.3.7.gnulib/gnulib/m4/xsize.m4
+--- gtk-vnc-0.3.7.dan3/gnulib/m4/xsize.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/m4/xsize.m4 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,13 @@
+# xsize.m4 serial 3
+dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+ AC_REQUIRE([AC_C_INLINE])
+ AC_CHECK_HEADERS(stdint.h)
+])
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/dummy.c gtk-vnc-0.3.7.gnulib/gnulib/tests/dummy.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/dummy.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/dummy.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/dummy.c gtk-vnc-0.3.7.gnulib/gnulib/tests/dummy.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/dummy.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/dummy.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,42 @@
+/* A dummy file, to prevent empty libraries from breaking builds.
+ Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+ this file is never empty. */
+typedef int dummy;
+#endif
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/intprops.h gtk-vnc-0.3.7.gnulib/gnulib/tests/intprops.h
---- gtk-vnc-0.3.7.mingw/gnulib/tests/intprops.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/intprops.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/intprops.h gtk-vnc-0.3.7.gnulib/gnulib/tests/intprops.h
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/intprops.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/intprops.h 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,77 @@
+/* intprops.h -- properties of integer types
+
+/* Bound on buffer size needed to represent an integer type or expression T,
+ including the terminating null. */
+#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/Makefile.am gtk-vnc-0.3.7.gnulib/gnulib/tests/Makefile.am
---- gtk-vnc-0.3.7.mingw/gnulib/tests/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/Makefile.am 2008-10-09 12:24:40.000000000 +0100
-@@ -0,0 +1,192 @@
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/Makefile.am gtk-vnc-0.3.7.gnulib/gnulib/tests/Makefile.am
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/Makefile.am 2008-10-09 15:24:54.000000000 +0100
+@@ -0,0 +1,210 @@
+## DO NOT EDIT! GENERATED AUTOMATICALLY!
+## Process this file with automake to produce Makefile.in.
+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
+
+## end gnulib module stdio-tests
+
++## begin gnulib module stdlib-tests
++
++TESTS += test-stdlib
++check_PROGRAMS += test-stdlib
++
++EXTRA_DIST += test-stdlib.c
++
++## end gnulib module stdlib-tests
++
+## begin gnulib module sys_socket-tests
+
+TESTS += test-sys_socket
+
+## end gnulib module sys_socket-tests
+
++## begin gnulib module unistd-tests
++
++TESTS += test-unistd
++check_PROGRAMS += test-unistd
++
++EXTRA_DIST += test-unistd.c
++
++## end gnulib module unistd-tests
++
+## begin gnulib module vasnprintf-tests
+
+TESTS += test-vasnprintf
+ fi; \
+ done; \
+ :
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-alloca-opt.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-alloca-opt.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-alloca-opt.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-alloca-opt.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-alloca-opt.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-alloca-opt.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-alloca-opt.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-alloca-opt.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,62 @@
+/* Test of optional automatic memory allocation.
+ Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-arpa_inet.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-arpa_inet.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-arpa_inet.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-arpa_inet.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-arpa_inet.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-arpa_inet.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-arpa_inet.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-arpa_inet.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,27 @@
+/* Test of <arpa/inet.h> substitute.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+{
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-errno.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-errno.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-errno.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-errno.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-errno.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-errno.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-errno.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-errno.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,117 @@
+/* Test of <errno.h> substitute.
+ Copyright (C) 2008 Free Software Foundation, Inc.
+
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-getaddrinfo.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-getaddrinfo.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-getaddrinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-getaddrinfo.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-getaddrinfo.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-getaddrinfo.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-getaddrinfo.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-getaddrinfo.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,155 @@
+/* Test the getaddrinfo module.
+
+ + simple (HOST3, SERV3)
+ + simple (HOST4, SERV4);
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-netinet_in.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-netinet_in.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-netinet_in.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-netinet_in.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-netinet_in.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-netinet_in.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-netinet_in.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-netinet_in.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,27 @@
+/* Test of <netinet/in.h> substitute.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+{
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-snprintf.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-snprintf.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-snprintf.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-snprintf.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-snprintf.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-snprintf.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-snprintf.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-snprintf.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,72 @@
+/* Test of snprintf() function.
+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
+
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-stdbool.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdbool.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-stdbool.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdbool.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-stdbool.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdbool.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-stdbool.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdbool.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,95 @@
+/* Test of <stdbool.h> substitute.
+ Copyright (C) 2002-2007 Free Software Foundation, Inc.
+{
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-stdint.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdint.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-stdint.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdint.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-stdint.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdint.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-stdint.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdint.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,360 @@
+/* Test of <stdint.h> substitute.
+ Copyright (C) 2006-2008 Free Software Foundation, Inc.
+{
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-stdio.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdio.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-stdio.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdio.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-stdio.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdio.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-stdio.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdio.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,30 @@
+/* Test of <stdio.h> substitute.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+{
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-sys_socket.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-sys_socket.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-sys_socket.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-sys_socket.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-stdlib.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdlib.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-stdlib.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-stdlib.c 2008-10-09 15:24:53.000000000 +0100
+@@ -0,0 +1,37 @@
++/* Test of <stdlib.h> substitute.
++ Copyright (C) 2007 Free Software Foundation, Inc.
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>. */
++
++/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
++
++#include <config.h>
++
++#include <stdlib.h>
++
++int exitcode;
++
++int
++main ()
++{
++ /* Check that some macros are defined and different integer constants. */
++ switch (exitcode)
++ {
++ case EXIT_SUCCESS:
++ case EXIT_FAILURE:
++ break;
++ }
++
++ return 0;
++}
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-sys_socket.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-sys_socket.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-sys_socket.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-sys_socket.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,47 @@
+/* Test of <sys/socket.h> substitute.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-vasnprintf.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vasnprintf.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-vasnprintf.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vasnprintf.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-unistd.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-unistd.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-unistd.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-unistd.c 2008-10-09 15:24:53.000000000 +0100
+@@ -0,0 +1,44 @@
++/* Test of <unistd.h> substitute.
++ Copyright (C) 2007 Free Software Foundation, Inc.
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>. */
++
++/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
++
++#include <config.h>
++
++#include <unistd.h>
++
++/* Check that the various SEEK_* macros are defined. */
++int sk[] = { SEEK_CUR, SEEK_END, SEEK_SET };
++
++/* Check that the types are all defined. */
++size_t t1;
++ssize_t t2;
++#ifdef TODO /* Not implemented in gnulib yet */
++uid_t t3;
++gid_t t4;
++#endif
++off_t t5;
++pid_t t6;
++#ifdef TODO
++useconds_t t7;
++intptr_t t8;
++#endif
++
++int
++main ()
++{
++ return 0;
++}
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-vasnprintf.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vasnprintf.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-vasnprintf.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vasnprintf.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,128 @@
+/* Test of vasnprintf() and asnprintf() functions.
+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ test_asnprintf ();
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-vc-list-files-cvs.sh gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vc-list-files-cvs.sh
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-vc-list-files-cvs.sh 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vc-list-files-cvs.sh 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-vc-list-files-cvs.sh gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vc-list-files-cvs.sh
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-vc-list-files-cvs.sh 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vc-list-files-cvs.sh 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,62 @@
+#!/bin/sh
+# Unit tests for vc-list-files
+done
+
+(exit $fail); exit $fail
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-vc-list-files-git.sh gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vc-list-files-git.sh
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-vc-list-files-git.sh 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vc-list-files-git.sh 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-vc-list-files-git.sh gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vc-list-files-git.sh
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-vc-list-files-git.sh 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-vc-list-files-git.sh 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,46 @@
+#!/bin/sh
+# Unit tests for vc-list-files
+ fail=0
+
+(exit $fail); exit $fail
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/test-wchar.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-wchar.c
---- gtk-vnc-0.3.7.mingw/gnulib/tests/test-wchar.c 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-wchar.c 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/test-wchar.c gtk-vnc-0.3.7.gnulib/gnulib/tests/test-wchar.c
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/test-wchar.c 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/test-wchar.c 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,31 @@
+/* Test of <wchar.h> substitute.
+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
+{
+ return 0;
+}
-diff -urN gtk-vnc-0.3.7.mingw/gnulib/tests/verify.h gtk-vnc-0.3.7.gnulib/gnulib/tests/verify.h
---- gtk-vnc-0.3.7.mingw/gnulib/tests/verify.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/gnulib/tests/verify.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/gnulib/tests/verify.h gtk-vnc-0.3.7.gnulib/gnulib/tests/verify.h
+--- gtk-vnc-0.3.7.dan3/gnulib/tests/verify.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/gnulib/tests/verify.h 2008-10-09 15:24:53.000000000 +0100
@@ -0,0 +1,140 @@
+/* Compile-time assert-like macros.
+
+# define verify(R) extern int (* verify_function__ (void)) [verify_true (R)]
+
+#endif
-diff -urN gtk-vnc-0.3.7.mingw/link-warning.h gtk-vnc-0.3.7.gnulib/link-warning.h
---- gtk-vnc-0.3.7.mingw/link-warning.h 1970-01-01 01:00:00.000000000 +0100
-+++ gtk-vnc-0.3.7.gnulib/link-warning.h 2008-10-09 12:24:39.000000000 +0100
+diff -urN gtk-vnc-0.3.7.dan3/link-warning.h gtk-vnc-0.3.7.gnulib/link-warning.h
+--- gtk-vnc-0.3.7.dan3/link-warning.h 1970-01-01 01:00:00.000000000 +0100
++++ gtk-vnc-0.3.7.gnulib/link-warning.h 2008-10-09 15:24:52.000000000 +0100
@@ -0,0 +1,28 @@
+/* GL_LINK_WARNING("literal string") arranges to emit the literal string as
+ a linker warning on most glibc systems.
git.annexia.org / fedora-mingw.git / blobdiff