diff options
author | Tor Lillqvist <tml@iki.fi> | 2003-10-24 03:41:22 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2003-10-24 03:41:22 +0000 |
commit | 5d097b85918181ed940768254595b232de4663c1 (patch) | |
tree | 547f717ad6301fad1046d7cbb5f7352bf9b2104f /config.h.win32.in | |
parent | dfa8c540a1932c4c7e376ca765c0d4707f0fd496 (diff) | |
download | glib-5d097b85918181ed940768254595b232de4663c1.tar.gz |
Force shared library (DLL) only on Windows. (I don't think that is
2003-10-24 Tor Lillqvist <tml@iki.fi>
* configure.in: Force shared library (DLL) only on Windows.
(I don't think that is controversial?) Remove unnecessary
AC_LIBTOOL_WIN32_DLL. Don't use -D_REENTRANT on
Win32, it is not used by mingw or MSVC headers.
* config.h.win32.in
* glibconfig.h.win32.in: Match what configure produces.
* glib/gconvert.c
* glib/gutils.c: Mark a couple of functions and variables that
aren't public as static.
* glib/gnulib/g-gnulib.h: Undef HAVE_SNPRINTF before (re)defining
it potentially differently, to silence compiler.
* glib/glib.def: Add some missing entries.
* tests/gobject/Makefile.am (LDADD): Reorder, put libgobject after
libtestgobject.
* tests/gobject/ifaceproperties.c (main): NULL-terminate arg list
to g_object_set() and _get().
Diffstat (limited to 'config.h.win32.in')
-rw-r--r-- | config.h.win32.in | 239 |
1 files changed, 110 insertions, 129 deletions
diff --git a/config.h.win32.in b/config.h.win32.in index 480bf4358..7c58713a2 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -1,62 +1,6 @@ /* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC. */ +/* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ -/* GLIB - Library of useful routines for C programming - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -/* acconfig.h - This file is in the public domain. - - Descriptive text for the C preprocessor macros that - the distributed Autoconf macros can define. - No software package will use all of them; autoheader copies the ones - your configure.in uses into your configuration header file templates. - - The entries are in sort -df order: alphabetical, case insensitive, - ignoring punctuation (such as underscores). Although this order - can split up related entries, it makes it easier to check whether - a given entry is in the file. - - Leave the following blank line there!! Autoheader needs it. */ - - -/* Other stuff */ - -/* #undef PACKAGE */ -/* #undef VERSION */ - - -/* Leave that blank line there!! Autoheader needs it. - If you're adding to this file, keep in mind: - The entries are in sort -df order: alphabetical, case insensitive, - ignoring punctuation (such as underscores). */ - -#define ENABLE_NLS 1 -#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@" -#define GLIB_LOCALE_DIR "NONE/lib/locale" -#define HAVE_GETTEXT 1 -/* #undef HAVE_LC_MESSAGES */ -#ifndef _MSC_VER -#define SANE_MALLOC_PROTOS 1 -#else /* _MSC_VER */ -/* #undef SANE_MALLOC_PROTOS */ -#endif /* _MSC_VER */ -#define USE_LIBICONV_GNU Using GNU libiconv -/* #undef USE_LIBICONV_NATIVE */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. @@ -75,6 +19,9 @@ /* always defined to indicate that i18n is enabled */ #define ENABLE_NLS 1 +/* Define the gettext package to be used */ +#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@" + /* Define to the GLIB binary age */ #define GLIB_BINARY_AGE @GLIB_BINARY_AGE@ @@ -84,6 +31,9 @@ /* Define to the GLIB interface age */ #define GLIB_INTERFACE_AGE @GLIB_INTERFACE_AGE@ +/* Define the location where the catalogs will be installed */ +#define GLIB_LOCALE_DIR "NONE/lib/locale" + /* Define to the GLIB major version */ #define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@ @@ -93,23 +43,10 @@ /* Define to the GLIB minor version */ #define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@ -/* Size of gmutex */ +/* The size of gmutex, as computed by sizeof. */ /* #undef GLIB_SIZEOF_GMUTEX */ -/* Size of intmax_t */ -#ifndef _MSC_VER -#define GLIB_SIZEOF_INTMAX_T 8 -#else /* _MSC_VER */ -#define GLIB_SIZEOF_INTMAX_T 0 -#endif /* _MSC_VER */ - -/* Size of ptrdiff_t */ -#define GLIB_SIZEOF_PTRDIFF_T 4 - -/* Size of size_t */ -#define GLIB_SIZEOF_SIZE_T 4 - -/* Size of system_thread */ +/* The size of system_thread, as computed by sizeof. */ #define GLIB_SIZEOF_SYSTEM_THREAD 4 /* Whether glib was compiled with debugging enabled */ @@ -139,7 +76,11 @@ /* #undef G_THREAD_USE_PID_SURROGATE */ /* A 'va_copy' style function */ +#ifndef _MSC_VER +#define G_VA_COPY va_copy +#else /* _MSC_VER */ /* #undef G_VA_COPY */ +#endif /* _MSC_VER */ /* 'va_lists' cannot be copies as values */ /* #undef G_VA_COPY_AS_ARRAY */ @@ -151,15 +92,16 @@ */ /* #undef HAVE_ALLOCA_H */ -/* Define to 1 if you have the <argz.h> header file. */ -/* #undef HAVE_ARGZ_H */ - /* Define to 1 if you have the `atexit' function. */ #define HAVE_ATEXIT 1 /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #define HAVE_BIND_TEXTDOMAIN_CODESET 1 +/* Define if you have a version of the snprintf function with semantics as + specified by the ISO C99 standard. */ +/* #undef HAVE_C99_SNPRINTF */ + /* Define if you have a version of the vsnprintf function with semantics as specified by the ISO C99 standard. */ /* #undef HAVE_C99_VSNPRINTF */ @@ -188,21 +130,26 @@ /* Define to 1 if you have the `getc_unlocked' function. */ /* #undef HAVE_GETC_UNLOCKED */ -/* Define to 1 if you have the `getpagesize' function. */ -#ifndef _MSC_VER -#define HAVE_GETPAGESIZE 1 -#else /* _MSC_VER */ -/* #undef HAVE_GETPAGESIZE */ -#endif /* _MSC_VER */ - /* Define if the GNU gettext() function is already present or preinstalled. */ #define HAVE_GETTEXT 1 /* define to use system printf */ /* #undef HAVE_GOOD_PRINTF */ -/* Define to 1 if you have the <inttypes.h> header file. */ +/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */ +#ifndef _MSC_VER +#define HAVE_INTMAX_T 1 +#else /* _MSC_VER */ +/* #undef HAVE_INTMAX_T */ +#endif /* _MSC_VER */ + +/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and + declares uintmax_t. */ +#ifndef _MSC_VER +#define HAVE_INTTYPES_H 1 +#else /* _MSC_VER */ /* #undef HAVE_INTTYPES_H */ +#endif /* _MSC_VER */ /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */ /* #undef HAVE_LANGINFO_CODESET */ @@ -222,12 +169,22 @@ /* Define to 1 if you have the `localtime_r' function. */ /* #undef HAVE_LOCALTIME_R */ +/* Define if you have the 'long double' type. */ +#define HAVE_LONG_DOUBLE 1 + +/* Define if you have the 'long long' type. */ +#ifndef _MSC_VER +#define HAVE_LONG_LONG 1 +#else /* _MSC_VER */ +/* #undef HAVE_LONG_LONG */ +#endif /* _MSC_VER */ + +/* define if system printf can print long long */ +#define HAVE_LONG_LONG_FORMAT 1 + /* Define to 1 if you have the `lstat' function. */ /* #undef HAVE_LSTAT */ -/* Define to 1 if you have the <malloc.h> header file. */ -#define HAVE_MALLOC_H 1 - /* Define to 1 if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 @@ -237,21 +194,12 @@ /* Define to 1 if you have the `mkstemp' function. */ /* #undef HAVE_MKSTEMP */ -/* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `munmap' function. */ -/* #undef HAVE_MUNMAP */ - /* Define to 1 if you have the `nanosleep' function. */ /* #undef HAVE_NANOSLEEP */ /* Define to 1 if you have the `nl_langinfo' function. */ /* #undef HAVE_NL_LANGINFO */ -/* Define to 1 if you have the <nl_types.h> header file. */ -/* #undef HAVE_NL_TYPES_H */ - /* Have non-POSIX function getpwuid_r */ /* #undef HAVE_NONPOSIX_GETPWUID_R */ @@ -267,12 +215,15 @@ /* Have function pthread_attr_setstacksize */ /* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */ -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 +/* Define to 1 if the system has the type `ptrdiff_t'. */ +#define HAVE_PTRDIFF_T 1 /* Define to 1 if you have the <pwd.h> header file. */ /* #undef HAVE_PWD_H */ +/* Define to 1 if you have the `readlink' function. */ +/* #undef HAVE_READLINK */ + /* Define to 1 if you have the <sched.h> header file. */ /* #undef HAVE_SCHED_H */ @@ -282,6 +233,13 @@ /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 +/* Define to 1 if you have the `snprintf' function. */ +#ifndef _MSC_VER +#define HAVE_SNPRINTF 1 +#else /* _MSC_VER */ +/* #undef HAVE_SNPRINTF */ +#endif /* _MSC_VER */ + /* Define to 1 if you have the <stddef.h> header file. */ #define HAVE_STDDEF_H 1 @@ -292,6 +250,14 @@ /* #undef HAVE_STDINT_H */ #endif /* _MSC_VER */ +/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares + uintmax_t. */ +#ifndef _MSC_VER +#define HAVE_STDINT_H_WITH_UINTMAX 1 +#else /* _MSC_VER */ +/* #undef HAVE_STDINT_H_WITH_UINTMAX */ +#endif /* _MSC_VER */ + /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 @@ -305,17 +271,15 @@ /* #undef HAVE_STRCASECMP */ #endif /* _MSC_VER */ -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 /* Define to 1 if you have the <strings.h> header file. */ +#ifndef _MSC_VER +#define HAVE_STRINGS_H 1 +#else /* _MSC_VER */ /* #undef HAVE_STRINGS_H */ +#endif /* _MSC_VER */ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 @@ -333,8 +297,15 @@ /* Define to 1 if you have the `strsignal' function. */ /* #undef HAVE_STRSIGNAL */ +/* Define to 1 if you have the `symlink' function. */ +/* #undef HAVE_SYMLINK */ + /* Define to 1 if you have the <sys/param.h> header file. */ +#ifndef _MSC_VER +#define HAVE_SYS_PARAM_H 1 +#else /* _MSC_VER */ /* #undef HAVE_SYS_PARAM_H */ +#endif /* _MSC_VER */ /* Define to 1 if you have the <sys/poll.h> header file. */ /* #undef HAVE_SYS_POLL_H */ @@ -380,25 +351,26 @@ #endif /* _MSC_VER */ /* Define to 1 if you have the `vasprintf' function. */ -/* #undef HAVE_VASPRINTF */ +#define HAVE_VASPRINTF 1 /* Define to 1 if you have the `vprintf' function. */ #define HAVE_VPRINTF 1 /* Define to 1 if you have the `vsnprintf' function. */ +#ifndef _MSC_VER +#define HAVE_VSNPRINTF 1 +#else /* _MSC_VER */ /* #undef HAVE_VSNPRINTF */ +#endif /* _MSC_VER */ -/* Have a working bcopy */ -/* #undef HAVE_WORKING_BCOPY */ - -/* Define to 1 if you have the `__argz_count' function. */ -/* #undef HAVE___ARGZ_COUNT */ +/* Define if you have the 'wchar_t' type. */ +#define HAVE_WCHAR_T 1 -/* Define to 1 if you have the `__argz_next' function. */ -/* #undef HAVE___ARGZ_NEXT */ +/* Define if you have the 'wint_t' type. */ +#define HAVE_WINT_T 1 -/* Define to 1 if you have the `__argz_stringify' function. */ -/* #undef HAVE___ARGZ_STRINGIFY */ +/* Have a working bcopy */ +/* #undef HAVE_WORKING_BCOPY */ /* didn't find fd_set */ #define NO_FD_SET 1 @@ -412,23 +384,20 @@ /* global 'sys_siglist' not declared */ #define NO_SYS_SIGLIST_DECL 1 -/* Name of package */ -/* #undef PACKAGE */ - /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" +#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=glib" /* Define to the full name of this package. */ -#define PACKAGE_NAME "" +#define PACKAGE_NAME "glib" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" +#define PACKAGE_STRING "glib @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.@GLIB_MICRO_VERSION@" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" +#define PACKAGE_TARNAME "glib" /* Define to the version of this package. */ -#define PACKAGE_VERSION "" +#define PACKAGE_VERSION "@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.@GLIB_MICRO_VERSION@" /* Maximum POSIX RT priority */ /* #undef POSIX_MAX_PRIORITY */ @@ -442,6 +411,13 @@ /* whether realloc (NULL,) works */ #define REALLOC_0_WORKS 1 +/* Define if you have correct malloc prototypes */ +#ifndef _MSC_VER +#define SANE_MALLOC_PROTOS 1 +#else /* _MSC_VER */ +/* #undef SANE_MALLOC_PROTOS */ +#endif /* _MSC_VER */ + /* The size of a `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 @@ -461,6 +437,9 @@ /* The size of a `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 +/* The size of a `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 4 + /* The size of a `void *', as computed by sizeof. */ #define SIZEOF_VOID_P 4 @@ -478,8 +457,11 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Version number of package */ -/* #undef VERSION */ +/* Using GNU libiconv */ +#define USE_LIBICONV_GNU 1 + +/* Using a native implementation of iconv in a separate library */ +/* #undef USE_LIBICONV_NATIVE */ /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ @@ -494,16 +476,15 @@ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ +/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */ #ifndef _MSC_VER -/* #undef inline */ +/* #undef intmax_t */ #else /* _MSC_VER */ -#define inline __inline +#define intmax_t long #endif /* _MSC_VER */ -/* Define to `long' if <sys/types.h> does not define. */ -/* #undef off_t */ +/* Define to empty if the C compiler doesn't support this keyword. */ +/* #undef signed */ /* Define to `unsigned' if <sys/types.h> does not define. */ /* #undef size_t */ |