From: Hans Breuer Date: Fri, 13 Apr 2001 23:41:53 +0000 (+0000) Subject: updated X-Git-Tag: GLIB_1_3_3~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=085254349a19ab6d208edd08bde56aeea3e5cd73;p=platform%2Fupstream%2Fglib.git updated 2001-04-14 Hans Breuer * glib.def : * makefile.msc.in : updated * gpattern.c : include "gutils.h" to resolve the inline hassle --- diff --git a/ChangeLog b/ChangeLog index c97343c..80d7f5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-04-14 Hans Breuer + + * glib.def : + * makefile.msc.in : updated + + * gpattern.c : include "gutils.h" to resolve the inline hassle + 2001-04-11 Alexander Larsson * glib-2.0.m4: Pass pkg-config options diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c97343c..80d7f5d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2001-04-14 Hans Breuer + + * glib.def : + * makefile.msc.in : updated + + * gpattern.c : include "gutils.h" to resolve the inline hassle + 2001-04-11 Alexander Larsson * glib-2.0.m4: Pass pkg-config options diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c97343c..80d7f5d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2001-04-14 Hans Breuer + + * glib.def : + * makefile.msc.in : updated + + * gpattern.c : include "gutils.h" to resolve the inline hassle + 2001-04-11 Alexander Larsson * glib-2.0.m4: Pass pkg-config options diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c97343c..80d7f5d 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +2001-04-14 Hans Breuer + + * glib.def : + * makefile.msc.in : updated + + * gpattern.c : include "gutils.h" to resolve the inline hassle + 2001-04-11 Alexander Larsson * glib-2.0.m4: Pass pkg-config options diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c97343c..80d7f5d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2001-04-14 Hans Breuer + + * glib.def : + * makefile.msc.in : updated + + * gpattern.c : include "gutils.h" to resolve the inline hassle + 2001-04-11 Alexander Larsson * glib-2.0.m4: Pass pkg-config options diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c97343c..80d7f5d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2001-04-14 Hans Breuer + + * glib.def : + * makefile.msc.in : updated + + * gpattern.c : include "gutils.h" to resolve the inline hassle + 2001-04-11 Alexander Larsson * glib-2.0.m4: Pass pkg-config options diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c97343c..80d7f5d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2001-04-14 Hans Breuer + + * glib.def : + * makefile.msc.in : updated + + * gpattern.c : include "gutils.h" to resolve the inline hassle + 2001-04-11 Alexander Larsson * glib-2.0.m4: Pass pkg-config options diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c97343c..80d7f5d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2001-04-14 Hans Breuer + + * glib.def : + * makefile.msc.in : updated + + * gpattern.c : include "gutils.h" to resolve the inline hassle + 2001-04-11 Alexander Larsson * glib-2.0.m4: Pass pkg-config options diff --git a/glib.def b/glib.def index 699fdf8..fec7682 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 699fdf8..fec7682 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 6ad1c27..a149273 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 diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in index 73ddfd9..06588d4 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 6ad1c27..a149273 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 diff --git a/makefile.msc.in b/makefile.msc.in index 73ddfd9..06588d4 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 \