X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=winconfig.h;h=a6daf8b05286c8b10b8dabe416649fee9906b609;hb=cadf391beab4c0d0c4aada7acb8fcb7c2e702e87;hp=62f8cfd62753720406f5558641b298ae256d3a5c;hpb=a04645d02221bcdc6684f8efb5521ccef9540b09;p=mono.git diff --git a/winconfig.h b/winconfig.h index 62f8cfd6275..a6daf8b0528 100644 --- a/winconfig.h +++ b/winconfig.h @@ -1,17 +1,31 @@ /* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +#ifndef _MSC_VER +#include "cygconfig.h" +#else /* 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 + +#if _WIN32_WINNT < 0x0600 +#error "Mono requires Windows Vista or later" +#endif /* _WIN32_WINNT < 0x0600 */ + /* * Features that are not required in the Windows port */ @@ -53,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 */ @@ -81,17 +92,51 @@ /* #undef HAVE_BLKSIZE_T */ /* Have Boehm GC */ -#define HAVE_BOEHM_GC 1 +/* #define HAVE_BOEHM_GC 1 */ /* Define to 1 if you have the header file. */ /* #undef HAVE_CHECKLIST_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_COMPLEX_H 1 + +/* Define to 1 if you have the `system' function. */ +#define HAVE_SYSTEM 1 + /* Have /dev/random */ #define HAVE_CRYPT_RNG 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_CURSES_H */ +/* Define to 1 if you have the declaration of `InterlockedAdd', + and to 0 if you don't. */ +#define HAVE_DECL_INTERLOCKEDADD 1 + +/* Define to 1 if you have the declaration of `InterlockedAdd64', + and to 0 if you don't. */ +#define HAVE_DECL_INTERLOCKEDADD64 1 + +/* Define to 1 if you have the declaration of `InterlockedCompareExchange64', + and to 0 if you don't. */ +#define HAVE_DECL_INTERLOCKEDCOMPAREEXCHANGE64 1 + +/* Define to 1 if you have the declaration of `InterlockedDecrement64', + and to 0 if you don't. */ +#define HAVE_DECL_INTERLOCKEDDECREMENT64 1 + +/* Define to 1 if you have the declaration of `InterlockedExchange64', + and to 0 if you don't. */ +#define HAVE_DECL_INTERLOCKEDEXCHANGE64 1 + +/* Define to 1 if you have the declaration of `InterlockedIncrement64', + and to 0 if you don't. */ +#define HAVE_DECL_INTERLOCKEDINCREMENT64 1 + +/* Define to 1 if you have the declaration of `__readfsdword', + and to 0 if you don't. */ +#define HAVE_DECL___READFSDWORD 1 + /* Define to 1 if you have the header file. */ /* #define HAVE_DIRENT_H 1 */ @@ -131,17 +176,14 @@ /* Define to 1 if you have the `fstatvfs' function. */ /* #undef HAVE_FSTATVFS */ -/* Have GC_enable */ -#define HAVE_GC_ENABLE 1 - -/* Have GC_gcj_malloc */ -#define HAVE_GC_GCJ_MALLOC 1 +/* Define to 1 if you have the `getaddrinfo' function. */ +#define HAVE_GETADDRINFO 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_GC_GC_H */ +/* Define to 1 if you have the `getnameinfo' function. */ +#define HAVE_GETNAMEINFO 1 -/* Have gc.h */ -#define HAVE_GC_H 1 +/* Define to 1 if you have the `getprotobyname' function. */ +#define HAVE_GETPROTOBYNAME 1 /* Define to 1 if you have the `getdomainname' function. */ /* #undef HAVE_GETDOMAINNAME */ @@ -162,9 +204,7 @@ /* #undef HAVE_GETPRIORITY */ /* Define to 1 if you have the `GetProcessId' function. */ -#if (_WIN32_WINNT >= 0x0502) #define HAVE_GETPROCESSID 1 -#endif /* Define to 1 if you have the `getpwnam_r' function. */ /* #undef HAVE_GETPWNAM_R */ @@ -188,7 +228,7 @@ /* #undef HAVE_INET_ATON */ /* Define to 1 if you have the `inet_pton' function. */ -/* #undef HAVE_INET_PTON */ +#define HAVE_INET_PTON 1 /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -259,9 +299,6 @@ /* No GC support. */ /* #undef HAVE_NULL_GC */ -/* Have oprofile support */ -/* #undef HAVE_OPROFILE */ - /* Define to 1 if you have the `poll' function. */ /* #undef HAVE_POLL */ @@ -328,6 +365,12 @@ /* Using the simple generational GC. */ /* #undef HAVE_SGEN_GC */ + /* Have signal */ +#define HAVE_SIGNAL 1 + + /* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + /* Have signbit */ /* #undef HAVE_SIGNBIT */ @@ -529,14 +572,8 @@ /* Enable the allocation and indexing of arrays greater than Int32.MaxValue */ /* #undef MONO_BIG_ARRAYS */ -/* The Mono Debugger is supported on this platform */ -/* #undef MONO_DEBUGGER_SUPPORTED */ - -/* Sizeof sock_un.sun_path */ -/* #undef MONO_SIZEOF_SUNPATH */ - /* Xen-specific behaviour */ -#define MONO_XEN_OPT 1 +/* #define MONO_XEN_OPT 1 */ /* Length of zero length arrays */ #define MONO_ZERO_LEN_ARRAY 1 @@ -566,9 +603,15 @@ #define PACKAGE_VERSION "6.6" /* Platform is Win32 */ -#define PLATFORM_WIN32 1 +#define HOST_WIN32 1 #define TARGET_WIN32 1 +#ifdef _WIN64 +#define TARGET_AMD64 1 +#else +#define TARGET_X86 1 +#endif + /* pthread_t is a pointer */ /* #undef PTHREAD_POINTER_ID */ @@ -587,11 +630,10 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* GC description */ -#define USED_GC_NAME "Included Boehm (with typed GC)" - /* Use included libgc */ -#define USE_INCLUDED_LIBGC 1 +/* #define USE_INCLUDED_LIBGC 1 */ + +#define DEFAULT_GC_NAME "Included Boehm (with typed GC)" /* ... */ /* #undef USE_MACH_SEMA */ @@ -600,4 +642,5 @@ /* #undef USE_MONO_MUTEX */ /* Version number of package */ -#define VERSION "2.0" +#define VERSION "#MONO_VERSION#" +#endif