Update config.h.win32(.in) and glibconfig.h.win32(.in)

-Make config.h.win32(.in) have entries that more resembles the generated
 config.h.in
-Move the ALIGNOF_* #define's from glibconfig.h.win32(.in) to
 config.h.win32(.in), where they were supposed to be.

config.h.win32.in

@@ -5,6 +5,15 @@
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
+/* The normal alignment of `guint32', in bytes. */
+#define ALIGNOF_GUINT32 4
+
+/* The normal alignment of `guint64', in bytes. */
+#define ALIGNOF_GUINT64 8
+
+/* The normal alignment of `unsigned long', in bytes. */
+#define ALIGNOF_UNSIGNED_LONG 4
+
 /* poll doesn't work on devices */
 #define BROKEN_POLL 1
 
@@ -109,6 +118,9 @@
 /* Define to 1 if you have the `clock_gettime' function. */
 /* #undef HAVE_CLOCK_GETTIME */
 
+/* define to 1 if Cocoa is available */
+/* #undef HAVE_COCOA */
+
 /* Have nl_langinfo (CODESET) */
 /* #undef HAVE_CODESET */
 
@@ -200,6 +212,9 @@
 /* Define to 1 if you have the `getpwuid' function. */
 /* #undef HAVE_GETPWUID */
 
+/* Define to 1 if you have the `getresuid' function. */
+/* #undef HAVE_GETRESUID */
+
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #define HAVE_GETTEXT 1
 
@@ -259,6 +274,9 @@
 /* Define if we have struct ip_mreqn */
 /* #undef HAVE_IP_MREQN */
 
+/* Define to 1 if you have the `issetugid' function. */
+/* #undef HAVE_ISSETUGID */
+
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 /* #undef HAVE_LANGINFO_CODESET */
 
@@ -277,6 +295,9 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #undef HAVE_LC_MESSAGES */
 
+/* Define if you have the __libc_enable_secure variable (GNU libc, eglibc) */
+/* #undef HAVE_LIBC_ENABLE_SECURE */
+
 /* Define if libelf is available */
 /* #undef HAVE_LIBELF */
 
@@ -554,6 +575,9 @@
    */
 /* #undef HAVE_SYS_DIR_H */
 
+/* Define to 1 if you have the <sys/filio.h> header file. */
+/* #undef HAVE_SYS_FILIO_H */
+
 /* Define to 1 if you have the <sys/inotify.h> header file. */
 /* #undef HAVE_SYS_INOTIFY_H */
 
@@ -839,6 +863,11 @@
 # endif
 #endif
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 

glib/glibconfig.h.win32.in

@@ -261,10 +261,6 @@ typedef void * GPid;
 #define GLIB_SYSDEF_MSG_PEEK      2
 #define GLIB_SYSDEF_MSG_DONTROUTE 4
 
-#define ALIGNOF_GUINT32 4
-#define ALIGNOF_GUINT64 8
-#define ALIGNOF_UNSIGNED_LONG 4
-
 G_END_DECLS
 
 #endif /* GLIBCONFIG_H */