12 files changed, 74 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 6127175e777..5c02b8c6e5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-20  Kornél Pál  <kornelpal@gmail.com>

+

+	* configure.in: Added Windows version macros to CPPFLAGS and export

+	CPPFLAGS for libgc configure to ensure Windows version compatibility.

+	* winconfig.h: Added compile-time feature detection and support for

+	64-bit Windows versions. Updated VERSION to 1.9.

+

 2008-03-19  Zoltan Varga  <vargaz@gmail.com>
 
 	* configure.in: Fix a typo.
diff --git a/configure.in b/configure.in
index 746e23907b2..17d8f3203b0 100644
--- a/configure.in
+++ b/configure.in
@@ -70,7 +70,10 @@ case "$host" in
 			export CC
 		fi
 		HOST_CC="gcc"
-		CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024 -DUNICODE -D_UNICODE"
+		# Windows 2000 is required that includes Internet Explorer 5.01
+		CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
+		# export for libgc configure
+		export CPPFLAGS
 		libmono_cflags="-mno-cygwin"
 		libmono_ldflags="-mno-cygwin"
 		libdl=
diff --git a/mono/io-layer/ChangeLog b/mono/io-layer/ChangeLog
index 0503e1b6399..112df250a0b 100644
--- a/mono/io-layer/ChangeLog
+++ b/mono/io-layer/ChangeLog
@@ -1,3 +1,6 @@
+2008-03-20  Kornél Pál  <kornelpal@gmail.com>
+
+	* io-layer.h: Removed Windows version macros.
 
 Thu Mar 13 16:24:53 CET 2008 Paolo Molaro <lupus@ximian.com>
 
diff --git a/mono/io-layer/io-layer.h b/mono/io-layer/io-layer.h
index f035b82e4b8..3270eda4b32 100644
--- a/mono/io-layer/io-layer.h
+++ b/mono/io-layer/io-layer.h
@@ -14,7 +14,6 @@
 #if defined(__WIN32__)
 /* Native win32 */
 #define __USE_W32_SOCKETS
-#define WINVER 0x0500 /* needed for CreateProcessWithLogonW */
 #include <winsock2.h>
 #include <windows.h>
 #include <winbase.h>
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 61e8f8325af..675942fc0bd 100644
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-20  Kornél Pál  <kornelpal@gmail.com>
+
+	* file-io.c, filewatcher.c, threadpool.c, threads.c: Removed Windows
+	version macros.
+
 2008-03-20  Mark Probst  <mark.probst@gmail.com>
 
 	* generic-sharing.c, class-internals.h: Code for putting
diff --git a/mono/metadata/file-io.c b/mono/metadata/file-io.c
index 409779c8dbb..8e250b72624 100644
--- a/mono/metadata/file-io.c
+++ b/mono/metadata/file-io.c
@@ -11,10 +11,6 @@
 
 #include <config.h>
 
-#ifdef PLATFORM_WIN32
-#define _WIN32_WINNT 0x0500
-#endif
-
 #include <glib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/mono/metadata/filewatcher.c b/mono/metadata/filewatcher.c
index 40f44364990..f43ee19203d 100644
--- a/mono/metadata/filewatcher.c
+++ b/mono/metadata/filewatcher.c
@@ -16,7 +16,7 @@
 #include <mono/metadata/filewatcher.h>
 #include <mono/metadata/marshal.h>
 #include <mono/utils/mono-dl.h>
-#if (defined (PLATFORM_WIN32) && WINVER >= 0x0400)
+#ifdef PLATFORM_WIN32
 
 /*
  * TODO:
diff --git a/mono/metadata/threadpool.c b/mono/metadata/threadpool.c
index 8370554c8dc..0f30ebd3603 100644
--- a/mono/metadata/threadpool.c
+++ b/mono/metadata/threadpool.c
@@ -12,11 +12,6 @@
 #include <config.h>
 #include <glib.h>
 
-#ifdef PLATFORM_WIN32
-#define WINVER 0x0500
-#define _WIN32_WINNT 0x0500
-#endif
-
 #define THREADS_PER_CPU	5 /* 20 + THREADS_PER_CPU * number of CPUs */
 
 #include <mono/metadata/domain-internals.h>
diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
index e4aae84cce5..93f700ddce9 100644
--- a/mono/metadata/threads.c
+++ b/mono/metadata/threads.c
@@ -10,9 +10,6 @@
  */
 
 #include <config.h>
-#ifdef PLATFORM_WIN32
-#define _WIN32_WINNT 0x0500
-#endif
 
 #include <glib.h>
 #include <signal.h>
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 00078aeae48..3913bfc57cd 100644
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-20  Kornél Pál  <kornelpal@gmail.com>
+
+	* mini.c: Removed Windows version macros.
+
 2008-03-20  Mark Probst  <mark.probst@gmail.com>
 
 	* generic-sharing.c: Put reflection types in the extensible part
diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 85a4f72e786..8823a20ae54 100644
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -26,10 +26,6 @@
 #include <pthread.h>
 #endif
 
-#ifdef PLATFORM_WIN32
-#define _WIN32_WINNT 0x0500
-#endif
-
 #ifdef HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>
 #endif
diff --git a/winconfig.h b/winconfig.h
index 072f3b86c43..1e3446e3548 100644
--- a/winconfig.h
+++ b/winconfig.h
@@ -1,5 +1,39 @@
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Version macros for Windows SDK headers */
+#ifdef _WIN64
+#ifdef _M_IA64
+/* Windows XP 64-bit Edition (Itanium) is the first release that is based on Windows XP */
+#define WINVER 0x0501
+#define _WIN32_WINNT 0x0501
+/* Includes Internet Explorer 6.0 */
+#define _WIN32_IE 0x0600
+#else /* !_M_IA64 */
+/* Windows XP Professional x64 Edition is the first release that is based on Windows Server 2003 SP1 */
+#define WINVER 0x0502
+#define _WIN32_WINNT 0x0502
+/* Includes Internet Explorer 6.0 SP2 */
+#define _WIN32_IE 0x0603
+#endif /* _M_IA64 */
+#else /* !_WIN64 */
+/* Windows 2000 is required */
+#define WINVER 0x0500
+#define _WIN32_WINNT 0x0500
+/* Includes Internet Explorer 5.01 */
+#define _WIN32_IE 0x0501
+#endif /* _WIN64 */
+
+#ifndef _UNICODE
+#define _UNICODE
+#endif
+#ifndef UNICODE
+#define UNICODE
+#endif
+
+#define WIN32_THREADS
+#define FD_SETSIZE 1024
+
 /* #undef HAVE_INET_PTON */
 /* #undef HAVE_INET_ATON */
 /* #undef HAVE_MSG_NOSIGNAL */
@@ -40,14 +74,19 @@
 /* #undef HAVE_WORKING_SIGALTSTACK */
 
 /* The architecture this is running on */
+#if defined(_M_IA64)
+#define ARCHITECTURE "ia64"
+#elif defined(_M_AMD64)
+#define ARCHITECTURE "amd64"
+#elif defined(_M_IX86)
 #define ARCHITECTURE "x86"
+#else
+#error Unknown architecture
+#endif
 
 /* String of disabled features */
 #define DISABLED_FEATURES "none"
 
-/* Have GetProcessId */
-#define HAVE_GETPROCESSID 1
-
 /* Disable AOT support */
 /* #undef DISABLE_AOT */
 
@@ -151,7 +190,9 @@
 /* #undef HAVE_GETGRNAM_R */
 
 /* Define to 1 if you have the `GetProcessId' function. */
-/* #undef HAVE_GETPROCESSID */
+#if (_WIN32_WINNT >= 0x0502)
+#define HAVE_GETPROCESSID 1
+#endif
 
 /* Define to 1 if you have the `getpwnam_r' function. */
 /* #undef HAVE_GETPWNAM_R */
@@ -430,7 +471,11 @@
 /* #undef SIZEOF_SIZE_T */
 
 /* The size of a `void *', as computed by sizeof. */
+#ifdef _WIN64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
+#endif
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -439,8 +484,4 @@
 #define USED_GC_NAME "Included Boehm (with typed GC)"
 
 /* Version number of package */
-#define VERSION "1.2"
-
-#define WINVER 0x0500
-
-#define _WIN32_WINNT 0x0500
\ No newline at end of file
+#define VERSION "1.9"