New files, used to generate corresponding non-.in files when making a

	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
 	New files, used to generate corresponding non-.in files when
 	making a dist. This is just so the version numbers will be kept in
 	synch automatically.

	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.

	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.

	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
 	then exit.

	* glib.def: Add a couple of functions.

ChangeLog

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <[email protected]>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+
 Sat May  1 10:26:20 PDT 1999 Manish Singh <[email protected]>
 
 	* acinclude.m4

ChangeLog.pre-2-0

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <[email protected]>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+
 Sat May  1 10:26:20 PDT 1999 Manish Singh <[email protected]>
 
 	* acinclude.m4

ChangeLog.pre-2-10

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <[email protected]>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+
 Sat May  1 10:26:20 PDT 1999 Manish Singh <[email protected]>
 
 	* acinclude.m4

ChangeLog.pre-2-12

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <[email protected]>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+
 Sat May  1 10:26:20 PDT 1999 Manish Singh <[email protected]>
 
 	* acinclude.m4

ChangeLog.pre-2-2

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <[email protected]>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+
 Sat May  1 10:26:20 PDT 1999 Manish Singh <[email protected]>
 
 	* acinclude.m4

ChangeLog.pre-2-4

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <[email protected]>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+
 Sat May  1 10:26:20 PDT 1999 Manish Singh <[email protected]>
 
 	* acinclude.m4

ChangeLog.pre-2-6

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <[email protected]>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+
 Sat May  1 10:26:20 PDT 1999 Manish Singh <[email protected]>
 
 	* acinclude.m4

ChangeLog.pre-2-8

@@ -1,3 +1,21 @@
+1999-05-06  Tor Lillqvist  <[email protected]>
+
+	* makefile.msc.in makefile.cygwin.in glibconfig.h.win32.in
+ 	config.h.win32.in tests/makefile.msc.in tests/makefile.cygwin.in:
+ 	New files, used to generate corresponding non-.in files when
+ 	making a dist. This is just so the version numbers will be kept in
+ 	synch automatically.
+
+	* configure.in: Also substitute @GLIB_MAJOR_VERSION@,
+ 	@GLIB_MINOR_VERSION@, and @GLIB_INTERFACE_AGE@.
+
+	* Makefile.am tests/Makefile.am: Also distribute makefile.cygwin.
+
+	* gerror.c (g_on_error_query): On Win32, put up a MessageBox and
+ 	then exit.
+
+	* glib.def: Add a couple of functions.
+
 Sat May  1 10:26:20 PDT 1999 Manish Singh <[email protected]>
 
 	* acinclude.m4

Makefile.am

@@ -18,6 +18,7 @@ EXTRA_DIST = \
 	README.win32		\
 	glib.def		\
 	makefile.msc		\
+	makefile.cygwin		\
 	giowin32.c		\
 	glibconfig.h.win32	\
 	config.h.win32
@@ -88,6 +89,18 @@ testgdateparser_LDADD = libglib.la
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib.m4
 
+glibconfig.h.win32: $(top_builddir)/config.status glibconfig.h.win32.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.h.win32: $(top_builddir)/config.status config.h.win32.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+makefile.msc: $(top_builddir)/config.status makefile.msc.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+makefile.cygwin: $(top_builddir)/config.status makefile.cygwin.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 .PHONY: files release sanity snapshot
 
 files:

README.win32

@@ -44,14 +44,15 @@ short. Otherwise stat() calls will fail.
 Before building you must get the pthreads library for Win32 from
 http://sourceware.cygnus.com/pthreads-win32/. The pthreads-win32
 snapshot from 1999-04-07 is the one that should be used. Edit the
-location of the pthreads library and include files in makefile.msc.
+location of the pthreads library and include files in makefile.msc or
+makefile.cygwin.
 
 If using the Microsoft toolchain, build with `nmake -f
 makefile.msc`. Install with `nmake -f makefile.msc install`.  If using
 egcs, build using `make -f makefile.cygwin`.
 
 To test the GLib functions, go to the tests subdirectory and enter
-`nmake -f makefile.msc check`.
+`nmake -f makefile.msc check` or `make -f makefile.cygwin check`.
 
 If you would want to use the cygwin tools to generate executables that
 *do* use the cygwin runtime, the normal Unix configuration method
@@ -83,7 +84,7 @@ Some of the usage of these macros was a bit mixed up, and had to be
 straightened out when adding the gcc support. In particular, I used to
 check for _MSC_VER in some places where I really wanted to check for
 the Microsoft C library, and those checks has now been changed to
-NATIVE_WIN32.
+NATIVE_WIN32. NATIVE_WIN32 should maybe be renamed to USE_MSVCRT.
 
 The pthreads for Win32 package that the thread support uses isn't
 quite ready yet, and thus threads really should not be relied upon.

config.h.win32 → config.h.win32.in

@@ -54,11 +54,11 @@
 /* #undef G_VA_COPY_AS_ARRAY */
 #define G_HAVE___INLINE 1
 
-#define GLIB_MAJOR_VERSION 1
-#define GLIB_MINOR_VERSION 3
-#define GLIB_MICRO_VERSION 0
-#define GLIB_INTERFACE_AGE 0
-#define GLIB_BINARY_AGE 0
+#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 G_THREAD_SOURCE "gthread-posix.c"
 

configure.in

@@ -40,7 +40,11 @@ GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
 dnl
 AC_DIVERT_POP()dnl
 
+AC_SUBST(GLIB_MAJOR_VERSION)
+AC_SUBST(GLIB_MINOR_VERSION)
 AC_SUBST(GLIB_VERSION)
+AC_SUBST(GLIB_INTERFACE_AGE)
+AC_SUBST(GLIB_BINARY_AGE)
 
 # libtool versioning
 LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION

gbacktrace.c

@@ -59,8 +59,10 @@
 #include <string.h> /* for bzero on BSD systems */
 #endif
 
-#ifdef _MSC_VER
-#include <process.h>		/* For _getpid() */
+#ifdef NATIVE_WIN32
+#  define STRICT		/* Strict typing, please */
+#  include <windows.h>
+#  include <process.h>		/* For _getpid() */
 #endif
 
 #ifndef NO_FD_SET
@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
 void
 g_on_error_query (const gchar *prg_name)
 {
+#ifndef NATIVE_WIN32
   static const gchar *query1 = "[E]xit, [H]alt";
   static const gchar *query2 = ", show [S]tack trace";
   static const gchar *query3 = " or [P]roceed";
@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name)
     }
   else
     goto retry;
+#else
+  if (!prg_name)
+    prg_name = g_get_prgname ();
+
+  MessageBox (NULL, "Terminating",
+	      (prg_name && *prg_name) ? prg_name : NULL,
+	      MB_OK|MB_ICONERROR);
+  _exit(0);
+#endif
 }
 
 void

gerror.c

@@ -59,8 +59,10 @@
 #include <string.h> /* for bzero on BSD systems */
 #endif
 
-#ifdef _MSC_VER
-#include <process.h>		/* For _getpid() */
+#ifdef NATIVE_WIN32
+#  define STRICT		/* Strict typing, please */
+#  include <windows.h>
+#  include <process.h>		/* For _getpid() */
 #endif
 
 #ifndef NO_FD_SET
@@ -82,6 +84,7 @@ volatile gboolean glib_on_error_halt = TRUE;
 void
 g_on_error_query (const gchar *prg_name)
 {
+#ifndef NATIVE_WIN32
   static const gchar *query1 = "[E]xit, [H]alt";
   static const gchar *query2 = ", show [S]tack trace";
   static const gchar *query3 = " or [P]roceed";
@@ -133,6 +136,15 @@ g_on_error_query (const gchar *prg_name)
     }
   else
     goto retry;
+#else
+  if (!prg_name)
+    prg_name = g_get_prgname ();
+
+  MessageBox (NULL, "Terminating",
+	      (prg_name && *prg_name) ? prg_name : NULL,
+	      MB_OK|MB_ICONERROR);
+  _exit(0);
+#endif
 }
 
 void

glib.def

@@ -353,6 +353,8 @@ EXPORTS
 	g_str_equal
 	g_str_hash
 	g_strcasecmp
+	g_strchomp
+	g_strchug
 	g_strconcat
 	g_strdelimit
 	g_strdown

glib/Makefile.am

@@ -18,6 +18,7 @@ EXTRA_DIST = \
 	README.win32		\
 	glib.def		\
 	makefile.msc		\
+	makefile.cygwin		\
 	giowin32.c		\
 	glibconfig.h.win32	\
 	config.h.win32
@@ -88,6 +89,18 @@ testgdateparser_LDADD = libglib.la
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib.m4
 
+glibconfig.h.win32: $(top_builddir)/config.status glibconfig.h.win32.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.h.win32: $(top_builddir)/config.status config.h.win32.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+makefile.msc: $(top_builddir)/config.status makefile.msc.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+makefile.cygwin: $(top_builddir)/config.status makefile.cygwin.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 .PHONY: files release sanity snapshot
 
 files: