+2001-09-26 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: (Win32:) Move the Win32 check closer to the start,
+ after the BeOS checks. Preset some autoconf variables so that
+ configure won't find those few headers and functions that gcc
+ (mingw) pretends to implement (even if the actual C library
+ doesn't), but MSVC doesn't. This because I want the same config.h
+ and glibconfig.h to be usable both from gcc and MSVC (as they use
+ the same C library). Some other minor hackery for this purpose.
+
+ * glibconfig.h.win32.in
+ * config.h.win32.in: Use versions generated by configure (and
+ hand-edited slightly).
+
2001-09-25 Darin Adler <darin@bentspoon.com>
* glib/gtree.h: Use gboolean for return value of GTraverseFunc.
+2001-09-26 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: (Win32:) Move the Win32 check closer to the start,
+ after the BeOS checks. Preset some autoconf variables so that
+ configure won't find those few headers and functions that gcc
+ (mingw) pretends to implement (even if the actual C library
+ doesn't), but MSVC doesn't. This because I want the same config.h
+ and glibconfig.h to be usable both from gcc and MSVC (as they use
+ the same C library). Some other minor hackery for this purpose.
+
+ * glibconfig.h.win32.in
+ * config.h.win32.in: Use versions generated by configure (and
+ hand-edited slightly).
+
2001-09-25 Darin Adler <darin@bentspoon.com>
* glib/gtree.h: Use gboolean for return value of GTraverseFunc.
+2001-09-26 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: (Win32:) Move the Win32 check closer to the start,
+ after the BeOS checks. Preset some autoconf variables so that
+ configure won't find those few headers and functions that gcc
+ (mingw) pretends to implement (even if the actual C library
+ doesn't), but MSVC doesn't. This because I want the same config.h
+ and glibconfig.h to be usable both from gcc and MSVC (as they use
+ the same C library). Some other minor hackery for this purpose.
+
+ * glibconfig.h.win32.in
+ * config.h.win32.in: Use versions generated by configure (and
+ hand-edited slightly).
+
2001-09-25 Darin Adler <darin@bentspoon.com>
* glib/gtree.h: Use gboolean for return value of GTraverseFunc.
+2001-09-26 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: (Win32:) Move the Win32 check closer to the start,
+ after the BeOS checks. Preset some autoconf variables so that
+ configure won't find those few headers and functions that gcc
+ (mingw) pretends to implement (even if the actual C library
+ doesn't), but MSVC doesn't. This because I want the same config.h
+ and glibconfig.h to be usable both from gcc and MSVC (as they use
+ the same C library). Some other minor hackery for this purpose.
+
+ * glibconfig.h.win32.in
+ * config.h.win32.in: Use versions generated by configure (and
+ hand-edited slightly).
+
2001-09-25 Darin Adler <darin@bentspoon.com>
* glib/gtree.h: Use gboolean for return value of GTraverseFunc.
+2001-09-26 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: (Win32:) Move the Win32 check closer to the start,
+ after the BeOS checks. Preset some autoconf variables so that
+ configure won't find those few headers and functions that gcc
+ (mingw) pretends to implement (even if the actual C library
+ doesn't), but MSVC doesn't. This because I want the same config.h
+ and glibconfig.h to be usable both from gcc and MSVC (as they use
+ the same C library). Some other minor hackery for this purpose.
+
+ * glibconfig.h.win32.in
+ * config.h.win32.in: Use versions generated by configure (and
+ hand-edited slightly).
+
2001-09-25 Darin Adler <darin@bentspoon.com>
* glib/gtree.h: Use gboolean for return value of GTraverseFunc.
+2001-09-26 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: (Win32:) Move the Win32 check closer to the start,
+ after the BeOS checks. Preset some autoconf variables so that
+ configure won't find those few headers and functions that gcc
+ (mingw) pretends to implement (even if the actual C library
+ doesn't), but MSVC doesn't. This because I want the same config.h
+ and glibconfig.h to be usable both from gcc and MSVC (as they use
+ the same C library). Some other minor hackery for this purpose.
+
+ * glibconfig.h.win32.in
+ * config.h.win32.in: Use versions generated by configure (and
+ hand-edited slightly).
+
2001-09-25 Darin Adler <darin@bentspoon.com>
* glib/gtree.h: Use gboolean for return value of GTraverseFunc.
+2001-09-26 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: (Win32:) Move the Win32 check closer to the start,
+ after the BeOS checks. Preset some autoconf variables so that
+ configure won't find those few headers and functions that gcc
+ (mingw) pretends to implement (even if the actual C library
+ doesn't), but MSVC doesn't. This because I want the same config.h
+ and glibconfig.h to be usable both from gcc and MSVC (as they use
+ the same C library). Some other minor hackery for this purpose.
+
+ * glibconfig.h.win32.in
+ * config.h.win32.in: Use versions generated by configure (and
+ hand-edited slightly).
+
2001-09-25 Darin Adler <darin@bentspoon.com>
* glib/gtree.h: Use gboolean for return value of GTraverseFunc.
+2001-09-26 Tor Lillqvist <tml@iki.fi>
+
+ * configure.in: (Win32:) Move the Win32 check closer to the start,
+ after the BeOS checks. Preset some autoconf variables so that
+ configure won't find those few headers and functions that gcc
+ (mingw) pretends to implement (even if the actual C library
+ doesn't), but MSVC doesn't. This because I want the same config.h
+ and glibconfig.h to be usable both from gcc and MSVC (as they use
+ the same C library). Some other minor hackery for this purpose.
+
+ * glibconfig.h.win32.in
+ * config.h.win32.in: Use versions generated by configure (and
+ hand-edited slightly).
+
2001-09-25 Darin Adler <darin@bentspoon.com>
* glib/gtree.h: Use gboolean for return value of GTraverseFunc.
-/* config.h.win32. Handcrafted for the Microsoft C library. */
+/* config.h.win32. Pregenerated . */
+/* 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. */
+\f
+
+/* Other stuff */
+
+/* #undef PACKAGE */
+/* #undef VERSION */
+
+\f
+/* 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 to empty if the keyword does not work. */
-/* #undef const */
+#define ENABLE_NLS 1
+#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+#define GLIB_LOCALE_DIR "NONE/lib/locale"
+#define HAVE_GETTEXT 1
+/* #undef HAVE_LC_MESSAGES */
+#define SANE_MALLOC_PROTOS 1
+#define USE_LIBICONV 1
-/* Define if you don't have vprintf but do have _doprnt. */
-/* #undef HAVE_DOPRNT */
+/* 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.
+ */
+/* #undef CRAY_STACKSEG_END */
-/* Define if you have the vprintf function. */
-#define HAVE_VPRINTF 1
+/* Define if using `alloca.c'. */
+/* #undef C_ALLOCA */
-/* Define if you have the ANSI C header files. */
-#define STDC_HEADERS 1
+/* Whether to disable memory pools */
+/* #undef DISABLE_MEM_POOLS */
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
+/* Whether to enable GC friendliness */
+/* #undef ENABLE_GC_FRIENDLY */
-/* #undef ENABLE_MEM_CHECK */
-/* #undef ENABLE_MEM_PROFILE */
+/* Define to the GLIB binary age */
+#define GLIB_BINARY_AGE @GLIB_BINARY_AGE@
-#define G_COMPILED_WITH_DEBUGGING "minimum"
+/* Byte contents of gmutex */
+/* #undef GLIB_BYTE_CONTENTS_GMUTEX */
-/* #undef HAVE_BROKEN_WCTYPE */
-/* #undef HAVE_DOPRNT */
-#define HAVE_GETCWD 1
-/* #undef HAVE_LOCALTIME_R */
-/* #undef HAVE_LONG_DOUBLE */
-/* #undef HAVE_POLL */
-/* #undef HAVE_SYS_POLL_H */
-#define HAVE_STRERROR 1
-#define HAVE_VPRINTF 1
-#define HAVE_WCHAR_H 1
-#define HAVE_WCTYPE_H 1
+/* Define to the GLIB interface age */
+#define GLIB_INTERFACE_AGE @GLIB_INTERFACE_AGE@
-/* #undef NO_FD_SET */
-/* #undef NO_SYS_ERRLIST */
-#define NO_SYS_SIGLIST 1
+/* Define to the GLIB major version */
+#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
-/* #undef G_VA_COPY */
-/* #undef G_VA_COPY_AS_ARRAY */
-#define G_HAVE___INLINE 1
+/* Define to the GLIB micro version */
+#define GLIB_MICRO_VERSION @GLIB_MINOR_VERSION@
-#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
-#define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
-#define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@
-#define GLIB_INTERFACE_AGE @GLIB_INTERFACE_AGE@
-#define GLIB_BINARY_AGE @GLIB_BINARY_AGE@
+/* Define to the GLIB minor version */
+#define GLIB_MINOR_VERSION @GLIB_MICRO_VERSION@
-#define GLIB_SIZEOF_SYSTEM_THREAD 4
-#define GLIB_SIZEOF_SIZE_T 4
+/* Size of gmutex */
+/* #undef GLIB_SIZEOF_GMUTEX */
+
+/* Size of intmax_t */
+#define GLIB_SIZEOF_INTMAX_T 0
+
+/* Size of ptrdiff_t */
#define GLIB_SIZEOF_PTRDIFF_T 4
-#define GLIB_SIZEOF_INTMAX_T 4
+/* Size of size_t */
+#define GLIB_SIZEOF_SIZE_T 4
+
+/* Size of system_thread */
+#define GLIB_SIZEOF_SYSTEM_THREAD 4
+
+/* Whether glib was compiled with debugging enabled */
+#define G_COMPILED_WITH_DEBUGGING "yes"
+
+/* Have inline keyword */
+/* #undef G_HAVE_INLINE */
+
+/* Have __inline keyword */
+#define G_HAVE___INLINE 1
+
+/* Have __inline__ keyword */
+/* #undef G_HAVE___INLINE__ */
+
+/* Source file containing theread implementation */
#define G_THREAD_SOURCE "gthread-win32.c"
-/* The number of bytes in a char. */
-#define SIZEOF_CHAR 1
+/* whether to use the PID niceness surrogate for thread priorities */
+/* #undef G_THREAD_USE_PID_SURROGATE */
-/* The number of bytes in a int. */
-#define SIZEOF_INT 4
+/* A 'va_copy' style function */
+/* #undef G_VA_COPY */
-/* The number of bytes in a long. */
-#define SIZEOF_LONG 4
+/* 'va_lists' cannot be copies as values */
+/* #undef G_VA_COPY_AS_ARRAY */
-/* The number of bytes in a long long. */
-#define SIZEOF_LONG_LONG 8
+/* Define if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
-/* The number of bytes in a short. */
-#define SIZEOF_SHORT 2
+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+/* #undef HAVE_ALLOCA_H */
-/* The number of bytes in a void *. */
-#define SIZEOF_VOID_P 4
+/* Define if you have the <argz.h> header file. */
+/* #undef HAVE_ARGZ_H */
-/* Define if you have the atexit function. */
+/* Define if you have the `atexit' function. */
#define HAVE_ATEXIT 1
-/* Define if you have the lstat function. */
+/* Have nl_langinfo (CODESET) */
+/* #undef HAVE_CODESET */
+
+/* Define if you have the `dcgettext' function. */
+#define HAVE_DCGETTEXT 1
+
+/* Define if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* Define if you have the <float.h> header file. */
+#define HAVE_FLOAT_H 1
+
+/* Define if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
+/* Define if you have the `getpagesize' function. */
+/* #undef HAVE_GETPAGESIZE */
+
+/* Define if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* Define if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define if you have the `localtime_r' function. */
+/* #undef HAVE_LOCALTIME_R */
+
+/* Define if you have the `lstat' function. */
/* #undef HAVE_LSTAT */
-/* Define if you have the memmove function. */
+/* Define if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define if you have the `memmove' function. */
#define HAVE_MEMMOVE 1
-/* Define if you have the on_exit function. */
+/* Define if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define if you have the `mkstemp' function. */
+/* #undef HAVE_MKSTEMP */
+
+/* Define if you have a working `mmap' system call. */
+/* #undef HAVE_MMAP */
+
+/* Define if you have the `munmap' function. */
+/* #undef HAVE_MUNMAP */
+
+/* Define if you have the `nanosleep' function. */
+/* #undef HAVE_NANOSLEEP */
+
+/* Define 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 */
+
+/* Define if you have the `on_exit' function. */
/* #undef HAVE_ON_EXIT */
-/* Define if you have the stpcpy function. */
+/* Define if you have the `poll' function. */
+/* #undef HAVE_POLL */
+
+/* Have POSIX function getpwuid_r */
+/* #undef HAVE_POSIX_GETPWUID_R */
+
+/* Have function pthread_attr_setstacksize */
+/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
+
+/* Define if you have the `putenv' function. */
+#define HAVE_PUTENV 1
+
+/* Define if you have the <pwd.h> header file. */
+/* #undef HAVE_PWD_H */
+
+/* Define if you have the <sched.h> header file. */
+/* #undef HAVE_SCHED_H */
+
+/* Define if you have the `setenv' function. */
+/* #undef HAVE_SETENV */
+
+/* Define if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define if you have the <stdint.h> header file. */
+/* #undef HAVE_STDINT_H */
+
+/* Define if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have the `stpcpy' function. */
/* #undef HAVE_STPCPY */
-/* Define if you have the strcasecmp function. */
+/* Define if you have the `strcasecmp' function. */
/* #undef HAVE_STRCASECMP */
-/* Define if you have the strerror function. */
+/* Define if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define if you have the `strerror' function. */
#define HAVE_STRERROR 1
-/* Define if you have the strsignal function. */
-/* #undef HAVE_STRSIGNAL */
+/* Define if you have the <strings.h> header file. */
+/* #undef HAVE_STRINGS_H */
-/* Define if you have the vsnprintf function. */
-/* #undef HAVE_VSNPRINTF */
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
-/* Define if you have the <float.h> header file. */
-#define HAVE_FLOAT_H 1
+/* Have functions strlcpy and strlcat */
+/* #undef HAVE_STRLCPY */
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
+/* Define if you have the `strncasecmp' function. */
+/* #undef HAVE_STRNCASECMP */
-/* Define if you have the <pwd.h> header file. */
-/* #undef HAVE_PWD_H */
+/* Define if you have the `strsignal' function. */
+/* #undef HAVE_STRSIGNAL */
-/* Define if you have the <sys/param.h> header file. */
+/* Define if you have the <sys/param.h> header file. */
/* #undef HAVE_SYS_PARAM_H */
-/* Define if you have the <sys/select.h> header file. */
+/* Define if you have the <sys/poll.h> header file. */
+/* #undef HAVE_SYS_POLL_H */
+
+/* found fd_set in sys/select.h */
/* #undef HAVE_SYS_SELECT_H */
-/* Define if you have the <sys/time.h> header file. */
-/* #undef HAVE_SYS_TIME_H */
+/* Define if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
-/* Define if you have the <sys/times.h> header file. */
+/* Define if you have the <sys/times.h> header file. */
/* #undef HAVE_SYS_TIMES_H */
-/* Define if you have the <unistd.h> header file. */
+/* Define if you have the <sys/time.h> header file. */
+/* #undef HAVE_SYS_TIME_H */
+
+/* Define if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if you have the <unistd.h> header file. */
/* #undef HAVE_UNISTD_H */
-/* Define if you have the <values.h> header file. */
+/* Define if you have the <values.h> header file. */
/* #undef HAVE_VALUES_H */
-/* Define if you have the w library (-lw). */
-/* #undef HAVE_LIBW */
+/* Define if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
-#define USE_LIBICONV 1
+/* Define if you have the `vsnprintf' function. */
+/* #undef HAVE_VSNPRINTF */
-#define ENABLE_NLS 1
+/* Have a working bcopy */
+/* #undef HAVE_WORKING_BCOPY */
-/* Dunno if this will expand correctly: */
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+/* Define if you have the `__argz_count' function. */
+/* #undef HAVE___ARGZ_COUNT */
+
+/* Define if you have the `__argz_next' function. */
+/* #undef HAVE___ARGZ_NEXT */
+
+/* Define if you have the `__argz_stringify' function. */
+/* #undef HAVE___ARGZ_STRINGIFY */
+
+/* didn't find fd_set */
+#define NO_FD_SET 1
+
+/* 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
+
+/* Maximum POSIX RT priority */
+/* #undef POSIX_MAX_PRIORITY */
+
+/* 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
+
+/* The size of a `char', as computed by sizeof. */
+#define SIZEOF_CHAR 1
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of a `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
+
+/* The size of a `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of a `void *', as computed by sizeof. */
+#define SIZEOF_VOID_P 4
+
+/* If using the C implementation of alloca, define if you know the
+ direction of stack growth for your system; otherwise it will be
+ automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
+/* #undef STACK_DIRECTION */
+
+/* Define if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define if your processor stores words with the most significant byte first
+ (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* 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 inline __inline
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
dnl
+AC_MSG_CHECKING([for Win32])
+case "$host" in
+ *-*-mingw*)
+ os_win32=yes
+ # Make config vars match MSVC, too. The mingw32 library that the
+ # mingw gcc always links with contains a few Unixish emulation
+ # functions. The mingw gcc also provides some headers that MSVC
+ # doesn't. As we want to be able to use the same config.h and
+ # glibconfig.h for both gcc and MSVC (because they use the same
+ # "real" C library, msvcrt.dll), hack around that.
+ ac_cv_func_getpagesize=no
+ ac_cv_func_strcasecmp=no
+ ac_cv_func_strncasecmp=no
+ ac_cv_header_dirent_h=no
+ ac_cv_header_stdint_h=no
+ ac_cv_header_sys_time_h=no
+ ac_cv_header_unistd_h=no
+ ac_cv_header_values_h=no
+
+ # Also hide some gcc features
+ ac_cv_c_inline=__inline
+ glib_cv_hasinline=no
+ glib_cv_has__inline__=no
+
+ G_LIB_WIN32_RESOURCE=glib-win32res.lo
+ G_MODULE_WIN32_RESOURCE=gmodule-win32res.lo
+ G_OBJECT_WIN32_RESOURCE=gobject-win32res.lo
+ G_THREAD_WIN32_RESOURCE=gthread-win32res.lo
+ GLIB_DEF=glib.def
+ GMODULE_DEF=gmodule.def
+ GOBJECT_DEF=gobject.def
+ GTHREAD_DEF=gthread.def
+ TESTGMODULE_EXP=testgmodule.exp
+ ;;
+ *)
+ os_win32=no
+ G_LIB_WIN32_RESOURCE=
+ G_MODULE_WIN32_RESOURCE=
+ G_OBJECT_WIN32_RESOURCE=
+ G_THREAD_WIN32_RESOURCE=
+ GLIB_DEF=
+ GMODULE_DEF=
+ GOBJECT_DEF=
+ GTHREAD_DEF=
+ TESTGMODULE_EXP=
+ ;;
+esac
+AC_MSG_RESULT($os_win32)
+AM_CONDITIONAL(OS_WIN32, test x$os_win32 = xyes)
+AC_SUBST(G_LIB_WIN32_RESOURCE)
+AC_SUBST(G_MODULE_WIN32_RESOURCE)
+AC_SUBST(G_OBJECT_WIN32_RESOURCE)
+AC_SUBST(G_THREAD_WIN32_RESOURCE)
+AC_SUBST(GLIB_DEF)
+AC_SUBST(GMODULE_DEF)
+AC_SUBST(GOBJECT_DEF)
+AC_SUBST(GTHREAD_DEF)
+AC_SUBST(TESTGMODULE_EXP)
+
+ms_linker_available=no
+if test $os_win32 = yes; then
+ AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
+fi
+AM_CONDITIONAL(MS_LIB_AVAILABLE, test $ms_librarian = yes)
+
GLIB_AC_DIVERT_BEFORE_HELP([
# figure debugging default, prior to $ac_help setup
case $GLIB_MINOR_VERSION in
AC_MSG_RESULT($platform_win32)
AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
-AC_MSG_CHECKING([if building for pure Win32])
-ms_linker_available=no
-case "$host" in
- *-*-mingw*)
- os_win32=yes
- G_LIB_WIN32_RESOURCE=glib-win32res.lo
- G_MODULE_WIN32_RESOURCE=gmodule-win32res.lo
- G_OBJECT_WIN32_RESOURCE=gobject-win32res.lo
- G_THREAD_WIN32_RESOURCE=gthread-win32res.lo
- GLIB_DEF=glib.def
- GMODULE_DEF=gmodule.def
- GOBJECT_DEF=gobject.def
- GTHREAD_DEF=gthread.def
- TESTGMODULE_EXP=testgmodule.exp
- ;;
- *)
- os_win32=no
- G_LIB_WIN32_RESOURCE=
- G_MODULE_WIN32_RESOURCE=
- G_OBJECT_WIN32_RESOURCE=
- G_THREAD_WIN32_RESOURCE=
- GLIB_DEF=
- GMODULE_DEF=
- GOBJECT_DEF=
- GTHREAD_DEF=
- TESTGMODULE_EXP=
- ;;
-esac
-AC_MSG_RESULT($os_win32)
-AM_CONDITIONAL(OS_WIN32, test x$os_win32 = xyes)
-AC_SUBST(G_LIB_WIN32_RESOURCE)
-AC_SUBST(G_MODULE_WIN32_RESOURCE)
-AC_SUBST(G_OBJECT_WIN32_RESOURCE)
-AC_SUBST(G_THREAD_WIN32_RESOURCE)
-AC_SUBST(GLIB_DEF)
-AC_SUBST(GMODULE_DEF)
-AC_SUBST(GOBJECT_DEF)
-AC_SUBST(GTHREAD_DEF)
-AC_SUBST(TESTGMODULE_EXP)
-
-if test $os_win32 = yes; then
- AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
- AC_MSG_RESULT($ms_librarian)
-fi
-AM_CONDITIONAL(MS_LIB_AVAILABLE, test $ms_librarian = yes)
-
dnl ***********************
dnl *** g_thread checks ***
dnl ***********************
if test -n "$gint64"; then
- cat >>$outfile <<_______EOF
+ if test x$glib_os_win32 = xyes; then
+ cat >>$outfile <<_______EOF
+#define G_HAVE_GINT64 1
+
+#ifdef _MSC_VER
+typedef __int64 gint64;
+typedef unsigned __int64 guint64;
+#define G_GINT64_CONSTANT(val) (val##i64)
+#elif __GNUC__
+typedef long long gint64;
+typedef unsigned long long guint64;
+#define G_GINT64_CONSTANT(val) (val##LL)
+#endif
+_______EOF
+ else
+ cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1
${glib_extension}typedef signed $gint64 gint64;
#define G_GINT64_CONSTANT(val) $gint64_constant
_______EOF
+ fi
if test -n "$gint64_format"; then
cat >>$outfile <<_______EOF
#define G_GINT64_FORMAT $gint64_format
if test x$g_have_gnuc_varargs = xyes ; then
cat >>$outfile <<_______EOF
+#ifdef __GNUC__
#define G_HAVE_GNUC_VARARGS 1
+#endif
_______EOF
fi
glib_header_alloca_h="$ac_cv_header_alloca_h"
fi
+if test $os_win32 = yes; then
+ glib_os_win32=yes
+fi
+
case xyes in
x$ac_cv_header_float_h)
glib_float_h=yes
-/* glibconfig.h.win32 */
-/* Handcrafted for Microsoft C and gcc -mno-cygwin ("mingw32"). */
+/* glibconfig.h.win32
+ *
+ * This is a based on a generated file. Please modify 'configure.in'
+ */
#ifndef __G_LIBCONFIG_H__
#define __G_LIBCONFIG_H__
-#include <gmacros.h>
-
-#ifdef _MSC_VER
-/* Make MSVC more pedantic, this is a recommended pragma list
- * from _Win32_Programming_ by Rector and Newcomer.
- */
-#pragma warning(error:4002)
-#pragma warning(error:4003)
-#pragma warning(1:4010)
-#pragma warning(error:4013)
-#pragma warning(1:4016)
-#pragma warning(error:4020)
-#pragma warning(error:4021)
-#pragma warning(error:4027)
-#pragma warning(error:4029)
-#pragma warning(error:4033)
-#pragma warning(error:4035)
-#pragma warning(error:4045)
-#pragma warning(error:4047)
-#pragma warning(error:4049)
-#pragma warning(error:4053)
-#pragma warning(error:4071)
-#pragma warning(disable:4101)
-#pragma warning(error:4150)
-
-#pragma warning(disable:4244) /* No possible loss of data warnings */
-#pragma warning(disable:4305) /* No truncation from int to char warnings */
-#endif /* _MSC_VER */
+#include <glib/gmacros.h>
#include <limits.h>
#include <float.h>
+G_BEGIN_DECLS
+
#define G_MINFLOAT FLT_MIN
#define G_MAXFLOAT FLT_MAX
#define G_MINDOUBLE DBL_MIN
#define G_MAXLONG LONG_MAX
#define G_MAXULONG ULONG_MAX
-G_BEGIN_DECLS
-
typedef signed char gint8;
typedef unsigned char guint8;
typedef signed short gint16;
typedef unsigned int guint32;
#define G_GINT32_FORMAT "i"
#define G_GUINT32_FORMAT "u"
-
#define G_HAVE_GINT64 1
-/* These are compiler specific */
#ifdef _MSC_VER
typedef __int64 gint64;
typedef unsigned __int64 guint64;
typedef long long gint64;
typedef unsigned long long guint64;
#define G_GINT64_CONSTANT(val) (val##LL)
-#define G_HAVE_ISO_VARARGS 1
#endif
-
-/* These depend on the C library. Using this file means the we
- * use the (bundled) Microsoft msvcrt.dll.
- */
#define G_GINT64_FORMAT "I64i"
#define G_GUINT64_FORMAT "I64u"
#define GLIB_SIZEOF_VOID_P 4
#define GLIB_SIZEOF_LONG 4
-typedef gint32 gssize;
+typedef gint32 gssize;
typedef guint32 gsize;
-#define GPOINTER_TO_INT(p) ((gint)(p))
-#define GPOINTER_TO_UINT(p) ((guint)(p))
+#define GPOINTER_TO_INT(p) ((gint) (p))
+#define GPOINTER_TO_UINT(p) ((guint) (p))
-#define GINT_TO_POINTER(i) ((gpointer)(i))
-#define GUINT_TO_POINTER(u) ((gpointer)(u))
+#define GINT_TO_POINTER(i) ((gpointer) (i))
+#define GUINT_TO_POINTER(u) ((gpointer) (u))
-#define g_ATEXIT(proc) (atexit (proc))
+#ifdef NeXT /* @#%@! NeXTStep */
+# define g_ATEXIT(proc) (!atexit (proc))
+#else
+# define g_ATEXIT(proc) (atexit (proc))
+#endif
#define g_memmove(d,s,n) G_STMT_START { memmove ((d), (s), (n)); } G_STMT_END
#define G_OS_WIN32
#define G_PLATFORM_WIN32
+
+
#ifdef __cplusplus
#define G_HAVE_INLINE 1
#else /* !__cplusplus */
+
#define G_HAVE___INLINE 1
+#endif /* !__cplusplus */
+
+#ifndef __cplusplus
+# define G_HAVE_ISO_VARARGS 1
+#endif
+
+#ifdef __GNUC__
+#define G_HAVE_GNUC_VARARGS 1
#endif
+
#define G_THREADS_ENABLED
#define G_THREADS_IMPL_WIN32
typedef struct _GMutex* GStaticMutex;
typedef union _GSystemThread GSystemThread;
union _GSystemThread
{
- /* The size of the data array is sizeof (GThreadData *), from
- * gthread-win32.c */
char data[4];
double dummy_double;
void *dummy_pointer;
#define GUINT16_TO_LE(val) ((guint16) (val))
#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
-
#define GINT32_TO_LE(val) ((gint32) (val))
#define GUINT32_TO_LE(val) ((guint32) (val))
#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))
-
#define GINT64_TO_LE(val) ((gint64) (val))
#define GUINT64_TO_LE(val) ((guint64) (val))
#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))
-
#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val))
#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val))
#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val))
#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val))
-
#define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val))
#define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val))
#define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val))
#define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val))
#define G_BYTE_ORDER G_LITTLE_ENDIAN
-#define GLIB_SYSDEF_POLLIN = 1
-#define GLIB_SYSDEF_POLLOUT = 4
-#define GLIB_SYSDEF_POLLPRI = 2
-#define GLIB_SYSDEF_POLLERR = 8
-#define GLIB_SYSDEF_POLLHUP = 16
-#define GLIB_SYSDEF_POLLNVAL = 32
+#define GLIB_SYSDEF_POLLIN =1
+#define GLIB_SYSDEF_POLLOUT =4
+#define GLIB_SYSDEF_POLLPRI =2
+#define GLIB_SYSDEF_POLLERR =8
+#define GLIB_SYSDEF_POLLHUP =16
+#define GLIB_SYSDEF_POLLNVAL =32
#define G_MODULE_SUFFIX "dll"
G_END_DECLS
-#endif /* __G_LIBCONFIG_H__ */
+#endif /* GLIBCONFIG_H */
projects / platform / upstream / glib.git / commitdiff