summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-08-15 16:50:57 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-08-15 16:50:57 +0000
commite44f6a8a008a07a6b991b6405fa3c9962e2be8e0 (patch)
treef7823a7437e7e5f178d19e9e294cf02159404ca4 /gtk
parent03813f369a24fc06716eb53b5d298316bd0f2faa (diff)
downloadgdk-pixbuf-e44f6a8a008a07a6b991b6405fa3c9962e2be8e0.tar.gz
Fixes for X/Cygwin builds of GTK+ (#107623, Masahiro Sakai):
Fri Aug 15 12:34:04 2003 Owen Taylor <otaylor@redhat.com> Fixes for X/Cygwin builds of GTK+ (#107623, Masahiro Sakai): * configure.in (GDK_DEP_LIBS_FOR_X): Make sure that we link libgtk against X explicitely, since we make GTK+ calls for plug/socket. * gtk/queryimmodules.c: Use USE_LA_MODULES and G_MODULE_SUFFIX here. * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_image): Protect XShmPutImage with #ifdef USE_SHM.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/queryimmodules.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
index 4ebe50c6f..ad99169ae 100644
--- a/gtk/queryimmodules.c
+++ b/gtk/queryimmodules.c
@@ -31,10 +31,10 @@
#include <unistd.h>
#endif
-#ifdef G_OS_WIN32
-#define SOEXT ".dll"
+#if USE_LA_MODULES
+#define SOEXT ".la"
#else
-#define SOEXT ".so"
+#define SOEXT ("." G_MODULE_SUFFIX)
#endif
#include <pango/pango-utils.h>
@@ -174,8 +174,7 @@ int main (int argc, char **argv)
while ((dent = g_dir_read_name (dir)))
{
- int len = strlen (dent);
- if (len > 3 && strcmp (dent + len - strlen (SOEXT), SOEXT) == 0)
+ if (g_str_has_suffix (dent, SOEXT))
error |= query_module (dirs[i], dent);
}