cleanup

[platform/upstream/glib.git] / config.h.win32.in

diff --git a/config.h.win32.in b/config.h.win32.in
index c20231e..aa700e3 100644 (file)
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -89,9 +89,6 @@
    */
 /* #undef HAVE_ALLOCA_H */
 
-/* Define to 1 if you have the `atexit' function. */
-#define HAVE_ATEXIT 1
-
 /* Define to 1 if you have the <attr/xattr.h> header file. */
 /* #undef HAVE_ATTR_XATTR_H */
 
@@ -138,12 +135,6 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
 
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
-
-/* define for working do while(0) macros */
-#define HAVE_DOWHILE_MACROS 1
-
 /* Define to 1 if using dtrace probes. */
 /* #undef HAVE_DTRACE */
 
@@ -216,18 +207,24 @@
 /* Define to 1 if you have the `hasmntopt' function. */
 /* #undef HAVE_HASMNTOPT */
 
+/* Target the Windows XP API */
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+
+#if _WIN32_WINNT >= 0x0600
+/* if_indextoname() and if_nametoindex() are available on Windows Vista/Server
+ * 2008 or later, so we can make use of them when building agaist Vista/Server
+ * 2008 or later.
+ */
+
 /* Define to 1 if you have the `if_indextoname' function. */
-/* This is available on Windows, but the catch is that this will require */
-/* Windows Vista/Server 2008, so disabled for now-please see */
-/* http://msdn.microsoft.com/en-us/library/windows/desktop/bb408408%28v=vs.85%29.aspx */
-/* #undef HAVE_IF_INDEXTONAME */
+#define HAVE_IF_INDEXTONAME 1
 
 /* Define to 1 if you have the `if_nametoindex' function. */
-/* This is available on Windows, but the catch is that this will require */
-/* Windows Vista/Server 2008, so disabled for now-please see */
-/* http://msdn.microsoft.com/en-us/library/windows/desktop/bb408409%28v=vs.85%29.aspx */
-/* A workaround for Windows XP is under review in Bug 668071 */
-/* #undef HAVE_IF_NAMETOINDEX */
+#define HAVE_IF_NAMETOINDEX 1
+
+#endif
 
 /* Define to 1 if you have the `inotify_init1' function. */
 /* #undef HAVE_INOTIFY_INIT1 */
@@ -321,6 +318,9 @@
 /* Define to 1 if you have the `lstat' function. */
 /* #undef HAVE_LSTAT */
 
+/* Define to 1 if you have the <mach/mach_time.h> header file. */
+/* #undef HAVE_MACH_MACH_TIME_H */
+
 /* Define to 1 if you have the <malloc.h> header file. */
 #define HAVE_MALLOC_H 1
 
@@ -354,6 +354,9 @@
 /* Have non-POSIX function getpwuid_r */
 /* #undef HAVE_NONPOSIX_GETPWUID_R */
 
+/* open option O_DIRECTORY */
+/* #undef HAVE_OPEN_O_DIRECTORY */
+
 /* Define to 1 if you have the `pipe2' function. */
 /* #undef HAVE_PIPE2 */
 
@@ -378,11 +381,8 @@
 /* Have function pthread_condattr_setclock */
 /* #undef HAVE_PTHREAD_CONDATTR_SETCLOCK */
 
-/* Have function pthread_cond_timedwait_monotonic */
-/* #undef HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC */
-
-/* Have function pthread_cond_timedwait_monotonic_np */
-/* #undef HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP */
+/* Have function pthread_cond_timedwait_relative_np */
+/* #undef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP */
 
 /* Define to 1 if the system has the type `ptrdiff_t'. */
 #define HAVE_PTRDIFF_T 1
@@ -561,9 +561,6 @@
 /* Define to 1 if you have the <sys/inotify.h> header file. */
 /* #undef HAVE_SYS_INOTIFY_H */
 
-/* Define to 1 if you have the <sys/mkdev.h> header file. */
-/* #undef HAVE_SYS_MKDEV_H */
-
 /* Define to 1 if you have the <sys/mntctl.h> header file. */
 /* #undef HAVE_SYS_MNTCTL_H */
 
@@ -584,9 +581,6 @@
 /* #undef HAVE_SYS_PARAM_H */
 #endif /* _MSC_VER or __DMC__ */
 
-/* Define to 1 if you have the <sys/poll.h> header file. */
-/* #undef HAVE_SYS_POLL_H */
-
 /* Define to 1 if you have the <sys/prctl.h> header file. */
 /* #undef HAVE_SYS_PRCTL_H */
 
@@ -630,13 +624,6 @@
 /* Define to 1 if you have the `timegm' function. */
 /* #undef HAVE_TIMEGM */
 
-/* Define to 1 if you have the <unistd.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_UNISTD_H 1
-#else /* _MSC_VER */
-/* #undef HAVE_UNISTD_H */
-#endif /* _MSC_VER */
-
 /* Define if your printf function family supports positional parameters as
    specified by Unix98. */
 /* #undef HAVE_UNIX98_PRINTF */
@@ -701,6 +688,14 @@
    */
 #define LT_OBJDIR ".libs/"
 
+/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
+   */
+/* #undef MAJOR_IN_MKDEV */
+
+/* Define to 1 if `major', `minor', and `makedev' are declared in
+   <sysmacros.h>. */
+/* #undef MAJOR_IN_SYSMACROS */
+
 /* didn't find fd_set */
 #define NO_FD_SET 1
 
@@ -728,9 +723,6 @@
 /* define if posix_memalign() can allocate any size */
 /* #undef POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS */
 
-/* whether realloc (NULL,) works */
-#define REALLOC_0_WORKS 1
-
 /* The size of `char', as computed by sizeof. */
 #define SIZEOF_CHAR 1
 
@@ -867,9 +859,6 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 /* #undef _POSIX_SOURCE */
 
-/* Target the Windows XP API */
-#define _WIN32_WINNT 0x0501
-
 /* Needed to get declarations for msg_control and msg_controllen on Solaris */
 /* #undef _XOPEN_SOURCE */