summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorHans Breuer <hans@breuer.org>2001-11-18 15:33:18 +0000
committerHans Breuer <hans@src.gnome.org>2001-11-18 15:33:18 +0000
commitcdc4f6a476940f20d5989c61016a15e13995bd15 (patch)
tree4b794b13c1ff8f41ccf0239198d8afa6ecd08425 /gdk-pixbuf
parente913a97b2d0f1ee3ae0fe92f3d6f3e3a66b817fa (diff)
downloadgtk+-cdc4f6a476940f20d5989c61016a15e13995bd15.tar.gz
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
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/ChangeLog8
-rw-r--r--gdk-pixbuf/io-xpm.c2
-rw-r--r--gdk-pixbuf/makefile.msc12
3 files changed, 18 insertions, 4 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 22a7b93c63..f6da4f82f1 100644
--- 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 583b05aad3..b18a82e640 100644
--- 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 94d7040ebb..5220575b3f 100644
--- 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