diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-05-19 14:49:39 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-05-19 14:49:39 +0800 |
| commit | f4ae0cbf9a464122ed4207a8ee74e424851d9bdf (patch) | |
| tree | 04ddeeebe153fcf61803d8e9174db77373ed035f | |
| parent | 4844b4bb564b152812ef6bf2ce5c514877ef323e (diff) | |
Update config.h.win32.in for Newer Windows
Make use of if_indextoname() and if_nametoindex() when building against
Window Vista/Server 2008 or later, as these are provided by the system.
This is not turned on by default as we still want to support XP and
Server 2003-turn this on by changing _WIN32_WINNT to 0x600 or later prior
to compiling GLib.
https://bugzilla.gnome.org/show_bug.cgi?id=730352
| -rw-r--r-- | config.h.win32.in | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/config.h.win32.in b/config.h.win32.in index 89c93dd55..d5cf8c000 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -207,18 +207,22 @@ /* Define to 1 if you have the `hasmntopt' function. */ /* #undef HAVE_HASMNTOPT */ +/* Target the Windows XP API */ +#define _WIN32_WINNT 0x0501 + +#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 */ @@ -853,9 +857,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 */ |