From a2e1541cda3902474aa54aded959f78928fbabf6 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 30 Dec 2011 15:27:31 +0800 Subject: [PATCH] config.h.win32.in: Cleanups -Make the contents of the preconfigured config.h.win32(.in) more like the contents of config.h.in -Correct the sizing of void* on x64 platforms (which should be 8, unlike 4 on x86-32 platforms) --- config.h.win32.in | 106 +++++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 49 deletions(-) diff --git a/config.h.win32.in b/config.h.win32.in index 3b74b4362..1e54ab3a3 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -5,9 +5,6 @@ /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ -/* define if asm blocks can use numeric local labels */ -/* #undef ASM_NUMERIC_LABELS */ - /* poll doesn't work on devices */ #define BROKEN_POLL 1 @@ -37,9 +34,6 @@ /* Define to the GLIB binary age */ #define GLIB_BINARY_AGE @GLIB_BINARY_AGE@ -/* Byte contents of gmutex */ -/* #undef GLIB_BYTE_CONTENTS_GMUTEX */ - /* Define to the GLIB interface age */ #define GLIB_INTERFACE_AGE @GLIB_INTERFACE_AGE@ @@ -55,15 +49,6 @@ /* Define to the GLIB minor version */ #define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@ -/* The size of gmutex, as computed by sizeof. */ -/* #undef GLIB_SIZEOF_GMUTEX */ - -/* The size of system_thread, as computed by sizeof. */ -#define GLIB_SIZEOF_SYSTEM_THREAD 4 - -/* whether GCC supports built-in atomic intrinsics */ -/* #undef HAVE_GCC_BUILTINS_FOR_ATOMIC_OPERATIONS */ - /* Have inline keyword */ #ifndef _MSC_VER #define G_HAVE_INLINE 1 @@ -200,24 +185,21 @@ /* we have the futex(2) system call */ /* #undef HAVE_FUTEX */ -/* Whether you have gcov */ -/* #undef HAVE_GCOV */ - /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 /* Define to 1 if you have the `getc_unlocked' function. */ /* #undef HAVE_GETC_UNLOCKED */ +/* Define to 1 if you have the `getfsstat' function. */ +/* #undef HAVE_GETFSSTAT */ + /* Define to 1 if you have the `getgrgid' function. */ /* #undef HAVE_GETGRGID */ /* Define to 1 if you have the `getmntent_r' function. */ /* #undef HAVE_GETMNTENT_R */ -/* Define to 1 if you have the `getmntinfo' function. */ -/* #undef HAVE_GETMNTINFO */ - /* Define to 1 if you have the `getprotobyname_r' function. */ /* #undef HAVE_GETPROTOBYNAME_R */ @@ -227,6 +209,9 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ #define HAVE_GETTEXT 1 +/* Define to 1 if you have the `getvfsstat' function. */ +/* #undef HAVE_GETVFSSTAT */ + /* Define to 1 if you have the `gmtime_r' function. */ /* #undef HAVE_GMTIME_R */ @@ -273,6 +258,9 @@ /* Define if you have and nl_langinfo(CODESET). */ /* #undef HAVE_LANGINFO_CODESET */ +/* Have nl_langinfo (_NL_CTYPE_OUTDIGITn_WC) */ +/* #undef HAVE_LANGINFO_OUTDIGIT */ + /* Have nl_langinfo (PM_STR) */ /* #undef HAVE_LANGINFO_TIME */ @@ -337,12 +325,18 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_MNTENT_H */ -/* Have a monotonic clock */ -/* #undef HAVE_MONOTONIC_CLOCK */ +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_NETDB_H */ +/* We have AF_NETLINK sockets */ +/* #undef HAVE_NETLINK */ + +/* Define to 1 if you have the `newlocale' function. */ +/* #undef HAVE_NEWLOCALE */ + /* Have non-POSIX function getgrgid_r */ /* #undef HAVE_NONPOSIX_GETGRGID_R */ @@ -367,6 +361,9 @@ /* Define to 1 if you have the `posix_memalign' function. */ /* #undef HAVE_POSIX_MEMALIGN */ +/* Define to 1 if you have the `prlimit' function. */ +/* #undef HAVE_PRLIMIT */ + /* Have function pthread_attr_setstacksize */ /* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */ @@ -403,9 +400,6 @@ /* Define to 1 if you have the `setresuid' function. */ /* #undef HAVE_SETRESUID */ -/* Define to 1 if you have the `setreuid' function. */ -/* #undef HAVE_SETREUID */ - /* Define to 1 if you have the `snprintf' function. */ #ifndef _MSC_VER #define HAVE_SNPRINTF 1 @@ -495,6 +489,18 @@ /* Define to 1 if you have the `strsignal' function. */ /* #undef HAVE_STRSIGNAL */ +/* Define to 1 if you have the `strtod_l' function. */ +/* #undef HAVE_STRTOD_L */ + +/* Define to 1 if you have the `strtoll_l' function. */ +/* #undef HAVE_STRTOLL_L */ + +/* Define to 1 if you have the `strtoull_l' function. */ +/* #undef HAVE_STRTOULL_L */ + +/* Define to 1 if `d_type' is a member of `struct dirent'. */ +/* #undef HAVE_STRUCT_DIRENT_D_TYPE */ + /* Define to 1 if `f_bavail' is a member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_BAVAIL */ @@ -504,6 +510,9 @@ /* Define to 1 if `f_basetype' is a member of `struct statvfs'. */ /* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */ +/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */ +/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */ + /* Define to 1 if `st_atimensec' is a member of `struct stat'. */ /* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */ @@ -537,6 +546,10 @@ /* Define to 1 if you have the `symlink' function. */ /* #undef HAVE_SYMLINK */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_INOTIFY_H */ @@ -552,6 +565,10 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_MOUNT_H */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + /* Define to 1 if you have the header file. */ #if !defined(_MSC_VER) && !defined(__DMC__) #define HAVE_SYS_PARAM_H 1 @@ -631,6 +648,9 @@ /* Define to 1 if you have the `unsetenv' function. */ /* #undef HAVE_UNSETENV */ +/* Define to 1 if you have the `uselocale' function. */ +/* #undef HAVE_USELOCALE */ + /* Define to 1 if you have the `utimes' function. */ /* #undef HAVE_UTIMES */ @@ -669,11 +689,6 @@ /* Define to 1 if you have the `wcslen' function. */ #define HAVE_WCSLEN 1 -/* Have Win32 atomic intrinsics */ -#ifdef _MSC_VER -#define HAVE_WIN32_BUILTINS_FOR_ATOMIC_OPERATIONS 1 -#endif - /* Define if you have the 'wint_t' type. */ #define HAVE_WINT_T 1 @@ -693,6 +708,9 @@ /* Define to 1 if xattr API uses XATTR_NOFOLLOW */ /* #undef HAVE_XATTR_NOFOLLOW */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_XLOCALE_H */ + /* Define to 1 if you have the `_NSGetEnviron' function. */ /* #undef HAVE__NSGETENVIRON */ @@ -709,15 +727,6 @@ /* Define to 1 if your C compiler doesn't accept -c and -o together. */ /* #undef NO_MINUS_C_MINUS_O */ -/* global 'sys_errlist' not found */ -#define NO_SYS_ERRLIST 1 - -/* global 'sys_siglist' not found */ -#define NO_SYS_SIGLIST 1 - -/* global 'sys_siglist' not declared */ -#define NO_SYS_SIGLIST_DECL 1 - /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=glib" @@ -736,18 +745,9 @@ /* Define to the version of this package. */ #define PACKAGE_VERSION "@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.@GLIB_MICRO_VERSION@" -/* Maximum POSIX RT priority */ -/* #undef POSIX_MAX_PRIORITY */ - /* define if posix_memalign() can allocate any size */ /* #undef POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS */ -/* Minimum POSIX RT priority */ -/* #undef POSIX_MIN_PRIORITY */ - -/* The POSIX RT yield function */ -/* #undef POSIX_YIELD_FUNC */ - /* whether realloc (NULL,) works */ #define REALLOC_0_WORKS 1 @@ -781,7 +781,15 @@ #define SIZEOF_SIZE_T 4 /* The size of `void *', as computed by sizeof. */ +#ifdef _MSC_VER +#if (defined(_M_X64) || defined(_M_AMD64)) +#define SIZEOF_VOID_P 8 +#elif (defined(_M_IX86)) #define SIZEOF_VOID_P 4 +#endif +#else +#define SIZEOF_VOID_P 4 +#endif /* The size of `__int64', as computed by sizeof. */ #define SIZEOF___INT64 8