Retract my change earlier today. Don't preset autoconf variables in a try

2001-09-26  Tor Lillqvist  <tml@iki.fi>

	* configure.in: Retract my change earlier today. Don't preset
	autoconf variables in a try to match both mingw and MSVC. Instead,
	he who packages a prebuilt GLib developer distribution for Win32
	runs configure twice: once for mingw, once for MSVC, and then uses
	diff -D on the glibconfig.h files to generate a suitably ifdeffed
	glibconfig.h for distribution that suits both compilers. (Ditto
	for config.h, although that file wouldn't be distributed in a
	developer package, but in a source package for Win32 users who
	want to build GLib but can't use configure.)

	* glibconfig.h.win32.in
	* config.h.win32.in: Generated by using diff -D as described above.

	* tests/makefile.mingw.in (.c.exe): Correct name of gthread (import)
	library.

gthread:
2001-09-26  Tor Lillqvist  <tml@iki.fi>

	* makefile.mingw.in: Fix couple of typos.

	* gthread.def: Add g_thread_init_with_errorcheck_mutexes.

1 files changed, 59 insertions, 1 deletions

diff --git a/config.h.win32.in b/config.h.win32.in
index 8f753e0f9..0a0f2a20e 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -1,4 +1,4 @@
-/* config.h.win32.  Pregenerated .  */
+/* config.h.win32.in Merged from two version 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
@@ -50,7 +50,11 @@
 #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 1
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
@@ -89,7 +93,11 @@
 /* #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
@@ -104,13 +112,21 @@
 #define G_COMPILED_WITH_DEBUGGING "yes"
 
 /* Have inline keyword */
+#ifndef _MSC_VER
+#define G_HAVE_INLINE 1
+#else /* _MSC_VER */
 /* #undef G_HAVE_INLINE */
+#endif /* _MSC_VER */
 
 /* Have __inline keyword */
 #define G_HAVE___INLINE 1
 
 /* Have __inline__ keyword */
+#ifndef _MSC_VER
+#define G_HAVE___INLINE__ 1
+#else /* _MSC_VER */
 /* #undef G_HAVE___INLINE__ */
+#endif /* _MSC_VER */
 
 /* Source file containing theread implementation */
 #define G_THREAD_SOURCE "gthread-win32.c"
@@ -155,7 +171,11 @@
 #define HAVE_GETCWD 1
 
 /* Define if you have the `getpagesize' function. */
+#ifndef _MSC_VER
+#define HAVE_GETPAGESIZE 1
+#else /* _MSC_VER */
 /* #undef HAVE_GETPAGESIZE */
+#endif /* _MSC_VER */
 
 /* Define if you have the <inttypes.h> header file. */
 /* #undef HAVE_INTTYPES_H */
@@ -227,7 +247,11 @@
 #define HAVE_SETLOCALE 1
 
 /* Define if you have the <stdint.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_STDINT_H 1
+#else /* _MSC_VER */
 /* #undef HAVE_STDINT_H */
+#endif /* _MSC_VER */
 
 /* Define if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
@@ -236,7 +260,11 @@
 /* #undef HAVE_STPCPY */
 
 /* Define if you have the `strcasecmp' function. */
+#ifndef _MSC_VER
+#define HAVE_STRCASECMP 1
+#else /* _MSC_VER */
 /* #undef HAVE_STRCASECMP */
+#endif /* _MSC_VER */
 
 /* Define if you have the `strchr' function. */
 #define HAVE_STRCHR 1
@@ -257,7 +285,11 @@
 /* #undef HAVE_STRLCPY */
 
 /* Define if you have the `strncasecmp' function. */
+#ifndef _MSC_VER
+#define HAVE_STRNCASECMP 1
+#else /* _MSC_VER */
 /* #undef HAVE_STRNCASECMP */
+#endif /* _MSC_VER */
 
 /* Define if you have the `strsignal' function. */
 /* #undef HAVE_STRSIGNAL */
@@ -278,16 +310,31 @@
 /* #undef HAVE_SYS_TIMES_H */
 
 /* Define if you have the <sys/time.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_SYS_TIME_H 1
+#else /* _MSC_VER */
 /* #undef HAVE_SYS_TIME_H */
+#endif /* _MSC_VER */
 
 /* 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. */
+#ifndef _MSC_VER
+#define HAVE_UNISTD_H 1
+#else /* _MSC_VER */
 /* #undef HAVE_UNISTD_H */
+#endif /* _MSC_VER */
 
 /* Define if you have the <values.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_VALUES_H 1
+#else /* _MSC_VER */
 /* #undef HAVE_VALUES_H */
+#endif /* _MSC_VER */
+
+/* Define if you have the `vasprintf' function. */
+/* #undef HAVE_VASPRINTF */
 
 /* Define if you have the `vprintf' function. */
 #define HAVE_VPRINTF 1
@@ -341,7 +388,11 @@
 #define SIZEOF_LONG 4
 
 /* The size of a `long long', as computed by sizeof. */
+#ifndef _MSC_VER
 #define SIZEOF_LONG_LONG 8
+#else /* _MSC_VER */
+#define SIZEOF_LONG_LONG 0
+#endif /* _MSC_VER */
 
 /* The size of a `short', as computed by sizeof. */
 #define SIZEOF_SHORT 2
@@ -349,6 +400,9 @@
 /* The size of a `void *', as computed by sizeof. */
 #define SIZEOF_VOID_P 4
 
+/* The size of a `__int64', as computed by sizeof. */
+#define SIZEOF___INT64 8
+
 /* 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.
@@ -369,7 +423,11 @@
 
 /* Define as `__inline' if that's what the C compiler calls it, or to nothing
    if it is not supported. */
+#ifndef _MSC_VER
+/* #undef inline */
+#else /* _MSC_VER */
 #define inline __inline
+#endif /* _MSC_VER */
 
 /* Define to `long' if <sys/types.h> does not define. */
 /* #undef off_t */