use g_strcasecmp(), some poor platforms don't have strcasecmp()

2001-11-18  Hans Breuer  <hans@breuer.org>

	* io-xpm.c : use g_strcasecmp(), some poor platforms
	don't have strcasecmp()

	* makefile.msc : do INCLUDE_png etc. definition here to avoid
	my temporary 'gdk-pixbuf-io-include.h' hack

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 22a7b93c63c3f2c86062e589c2e64e854a6a5cb4..f6da4f82f11fba392aaf5ee879f2db4a3ffed935 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-18  Hans Breuer  <hans@breuer.org>
+
+       * io-xpm.c : use g_strcasecmp(), some poor platforms
+       don't have strcasecmp()
+
+       * makefile.msc : do INCLUDE_png etc. definition here to avoid
+       my temporary 'gdk-pixbuf-io-include.h' hack
+
 Sun Nov 18 07:54:22 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk-pixbuf-loader.c: Remove include of gobject/signal.h.

diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index 583b05aad3fb23e33c2e3825877188ecd018758c..b18a82e640c6f6fa81e443939af420c8f3753df1 100644 (file)
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -898,7 +898,7 @@ static XPMColorEntry xColors[] = {
 static int
 compare_xcolor_entries (const void *a, const void *b)
 {
-  return strcasecmp ((const char *) a, ((const XPMColorEntry *) b)->name);
+  return g_strcasecmp ((const char *) a, ((const XPMColorEntry *) b)->name);
 }
 
 static gboolean

diff --git a/gdk-pixbuf/makefile.msc b/gdk-pixbuf/makefile.msc
index 94d7040ebbf52061feaa7966b74d76b412a1e9e4..5220575b3f7e2c688fb59ef177f10c8ab632b28a 100644 (file)
--- a/gdk-pixbuf/makefile.msc
+++ b/gdk-pixbuf/makefile.msc
@@ -11,11 +11,17 @@ PERL = perl
 
 GDK_PIXBUF_VER = 1.3
 
-# force inclusion of gdk-pixbuf-io-include.h
-# to get _working_ include modules ...
+# to get _working_ include modules we need respective defines ...
+BUILT_IN_FORMATS = -DINCLUDE_png -DINCLUDE_bmp -DINCLUDE_gif \
+       -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_xpm -DINCLUDE_wbmp \
+       -DINCLUDE_pnm -DINCLUDE_ras
+
+# -DINCLUDE_tiff
+
+
 
 PKG_CFLAGS = -I. -I.. $(GLIB_CFLAGS) \
-       -FIgdk-pixbuf-io-include.h \
+       $(BUILT_IN_FORMATS) \
        $(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) $(INTL_CFLAGS) \
        $(G_DEBUGGING) \
        -UUSE_GMODULE # use built-in