projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2261 from BrzVlad/fix-arm-fast-tls-master
[mono.git]
/
winconfig.h
diff --git
a/winconfig.h
b/winconfig.h
index 71555cecf19cb644d73abd4909edb5fdf349616d..1a9a35eb18ae5136db406fb8c8770e462c39d4e3 100644
(file)
--- a/
winconfig.h
+++ b/
winconfig.h
@@
-7,11
+7,11
@@
/* The architecture this is running on */
#if defined(_M_IA64)
/* The architecture this is running on */
#if defined(_M_IA64)
-#define ARCHITECTURE "ia64"
+#define
MONO_
ARCHITECTURE "ia64"
#elif defined(_M_AMD64)
#elif defined(_M_AMD64)
-#define ARCHITECTURE "amd64"
+#define
MONO_
ARCHITECTURE "amd64"
#elif defined(_M_IX86)
#elif defined(_M_IX86)
-#define ARCHITECTURE "x86"
+#define
MONO_
ARCHITECTURE "x86"
#else
#error Unknown architecture
#endif
#else
#error Unknown architecture
#endif
@@
-67,9
+67,6
@@
/* Disable reflection emit support */
/* #undef DISABLE_REFLECTION_EMIT */
/* 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 */
/* Disable advanced SSA JIT optimizations */
/* #undef DISABLE_SSA */
@@
-645,5
+642,5
@@
/* #undef USE_MONO_MUTEX */
/* Version number of package */
/* #undef USE_MONO_MUTEX */
/* Version number of package */
-#define VERSION "
4.1.0
"
+#define VERSION "
#MONO_VERSION#
"
#endif
#endif