updated

2001-04-14  Hans Breuer  <hans@breuer.org>

	* glib.def :
	* makefile.msc.in : updated

	* gpattern.c : include "gutils.h" to resolve the inline hassle

14 files changed, 64 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c97343cc3..80d7f5d3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-14  Hans Breuer  <hans@breuer.org>
+
+	* glib.def : 
+	* makefile.msc.in : updated
+
+	* gpattern.c : include "gutils.h" to resolve the inline hassle
+
 2001-04-11  Alexander Larsson  <alexl@redhat.com>
 
 	* glib-2.0.m4: Pass pkg-config options
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c97343cc3..80d7f5d3d 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2001-04-14  Hans Breuer  <hans@breuer.org>
+
+	* glib.def : 
+	* makefile.msc.in : updated
+
+	* gpattern.c : include "gutils.h" to resolve the inline hassle
+
 2001-04-11  Alexander Larsson  <alexl@redhat.com>
 
 	* glib-2.0.m4: Pass pkg-config options
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c97343cc3..80d7f5d3d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2001-04-14  Hans Breuer  <hans@breuer.org>
+
+	* glib.def : 
+	* makefile.msc.in : updated
+
+	* gpattern.c : include "gutils.h" to resolve the inline hassle
+
 2001-04-11  Alexander Larsson  <alexl@redhat.com>
 
 	* glib-2.0.m4: Pass pkg-config options
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c97343cc3..80d7f5d3d 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+2001-04-14  Hans Breuer  <hans@breuer.org>
+
+	* glib.def : 
+	* makefile.msc.in : updated
+
+	* gpattern.c : include "gutils.h" to resolve the inline hassle
+
 2001-04-11  Alexander Larsson  <alexl@redhat.com>
 
 	* glib-2.0.m4: Pass pkg-config options
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c97343cc3..80d7f5d3d 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2001-04-14  Hans Breuer  <hans@breuer.org>
+
+	* glib.def : 
+	* makefile.msc.in : updated
+
+	* gpattern.c : include "gutils.h" to resolve the inline hassle
+
 2001-04-11  Alexander Larsson  <alexl@redhat.com>
 
 	* glib-2.0.m4: Pass pkg-config options
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c97343cc3..80d7f5d3d 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2001-04-14  Hans Breuer  <hans@breuer.org>
+
+	* glib.def : 
+	* makefile.msc.in : updated
+
+	* gpattern.c : include "gutils.h" to resolve the inline hassle
+
 2001-04-11  Alexander Larsson  <alexl@redhat.com>
 
 	* glib-2.0.m4: Pass pkg-config options
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c97343cc3..80d7f5d3d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2001-04-14  Hans Breuer  <hans@breuer.org>
+
+	* glib.def : 
+	* makefile.msc.in : updated
+
+	* gpattern.c : include "gutils.h" to resolve the inline hassle
+
 2001-04-11  Alexander Larsson  <alexl@redhat.com>
 
 	* glib-2.0.m4: Pass pkg-config options
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c97343cc3..80d7f5d3d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2001-04-14  Hans Breuer  <hans@breuer.org>
+
+	* glib.def : 
+	* makefile.msc.in : updated
+
+	* gpattern.c : include "gutils.h" to resolve the inline hassle
+
 2001-04-11  Alexander Larsson  <alexl@redhat.com>
 
 	* glib-2.0.m4: Pass pkg-config options
diff --git a/glib.def b/glib.def
index 699fdf8f2..fec768234 100644
--- a/glib.def
+++ b/glib.def
@@ -629,3 +629,4 @@ EXPORTS
 	glib_mem_profiler_table
 	glib_micro_version
 	glib_minor_version
+
diff --git a/glib/glib.def b/glib/glib.def
index 699fdf8f2..fec768234 100644
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -629,3 +629,4 @@ EXPORTS
 	glib_mem_profiler_table
 	glib_micro_version
 	glib_minor_version
+
diff --git a/glib/gpattern.c b/glib/gpattern.c
index 6ad1c27f7..a149273a0 100644
--- a/glib/gpattern.c
+++ b/glib/gpattern.c
@@ -21,6 +21,7 @@
 #include "gmacros.h"
 #include "gmessages.h"
 #include "gmem.h"
+#include "gutils.h" /* inline hassle */
 #include <string.h>
 
 
diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index 73ddfd97c..06588d425 100644
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -3,7 +3,7 @@
 
 TOP = ..
 
-!INCLUDE build\win32\make.msc
+!INCLUDE $(TOP)\build\win32\make.msc
 
 # Possibly override GLib version in build\win32\module.defs
 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
@@ -55,6 +55,7 @@ glib_OBJECTS =			\
 	gprimes.obj		\
 	gqsort.obj		\
 	gqueue.obj		\
+	gpattern.obj	\
 	grand.obj		\
 	grel.obj		\
 	gscanner.obj		\
diff --git a/gpattern.c b/gpattern.c
index 6ad1c27f7..a149273a0 100644
--- a/gpattern.c
+++ b/gpattern.c
@@ -21,6 +21,7 @@
 #include "gmacros.h"
 #include "gmessages.h"
 #include "gmem.h"
+#include "gutils.h" /* inline hassle */
 #include <string.h>
 
 
diff --git a/makefile.msc.in b/makefile.msc.in
index 73ddfd97c..06588d425 100644
--- a/makefile.msc.in
+++ b/makefile.msc.in
@@ -3,7 +3,7 @@
 
 TOP = ..
 
-!INCLUDE build\win32\make.msc
+!INCLUDE $(TOP)\build\win32\make.msc
 
 # Possibly override GLib version in build\win32\module.defs
 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
@@ -55,6 +55,7 @@ glib_OBJECTS =			\
 	gprimes.obj		\
 	gqsort.obj		\
 	gqueue.obj		\
+	gpattern.obj	\
 	grand.obj		\
 	grel.obj		\
 	gscanner.obj		\