X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=winconfig.h;h=834bbe7bfae22c1dc8d974154daecdadff1fec7b;hb=707d91400710b129a51c38154386e04047608714;hp=c9074d39257d9871fe2ab3067778b62c535dbd8b;hpb=8ef4e4703172fd32ada3f74b22df5203b4683493;p=mono.git diff --git a/winconfig.h b/winconfig.h index c9074d39257..834bbe7bfae 100644 --- a/winconfig.h +++ b/winconfig.h @@ -81,7 +81,7 @@ /* #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 */ @@ -92,6 +92,10 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_CURSES_H */ +/* 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 header file. */ /* #define HAVE_DIRENT_H 1 */ @@ -132,16 +136,16 @@ /* #undef HAVE_FSTATVFS */ /* Have GC_enable */ -#define HAVE_GC_ENABLE 1 +/* #define HAVE_GC_ENABLE 1 */ /* Have GC_gcj_malloc */ -#define HAVE_GC_GCJ_MALLOC 1 +/* #define HAVE_GC_GCJ_MALLOC 1 */ /* Define to 1 if you have the header file. */ /* #undef HAVE_GC_GC_H */ /* Have gc.h */ -#define HAVE_GC_H 1 +/* #define HAVE_GC_H 1 */ /* Define to 1 if you have the `getdomainname' function. */ /* #undef HAVE_GETDOMAINNAME */ @@ -569,6 +573,12 @@ #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 +597,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 +609,4 @@ /* #undef USE_MONO_MUTEX */ /* Version number of package */ -#define VERSION "2.7" +#define VERSION "2.11"