Merge pull request #2311 from mlancione/master

[mono.git] / winconfig.h

diff --git a/winconfig.h b/winconfig.h
index b30a3eb1c8e67f4e8ef9cd171b1dc6971f53fa99..1a9a35eb18ae5136db406fb8c8770e462c39d4e3 100644 (file)
--- a/winconfig.h
+++ b/winconfig.h
@@ -7,16 +7,18 @@
 
 /* The architecture this is running on */
 #if defined(_M_IA64)
-#define ARCHITECTURE "ia64"
+#define MONO_ARCHITECTURE "ia64"
 #elif defined(_M_AMD64)
-#define ARCHITECTURE "amd64"
+#define MONO_ARCHITECTURE "amd64"
 #elif defined(_M_IX86)
-#define ARCHITECTURE "x86"
+#define MONO_ARCHITECTURE "x86"
 #else
 #error Unknown architecture
 #endif
 
+#ifndef WINVER
 #define WINVER 0x0A00
+#endif
 
 #include <SDKDDKVer.h>
 
@@ -65,9 +67,6 @@
 /* Disable reflection emit support */
 /* #undef DISABLE_REFLECTION_EMIT */
 
-/* Disable inter-process shared handles */
-/* #undef DISABLE_SHARED_HANDLES */
-
 /* Disable advanced SSA JIT optimizations */
 /* #undef DISABLE_SSA */
 
@@ -643,5 +642,5 @@
 /* #undef USE_MONO_MUTEX */
 
 /* Version number of package */
-#define VERSION "4.1.0"
+#define VERSION "#MONO_VERSION#"
 #endif