diff options
| author | Tim Janik <timj@src.gnome.org> | 1998-12-16 06:05:46 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-12-16 06:05:46 +0000 |
| commit | 62347c40d97c958a30729986adfde54489102afe (patch) | |
| tree | dbcb728261bd7f173c40f30581164cc8930da704 /gdk | |
| parent | 017dfc9e4ee30ef271b5392a5f45d37ab0ad2e87 (diff) | |
| download | gdk-pixbuf-62347c40d97c958a30729986adfde54489102afe.tar.gz | |
urg, fixups
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/Makefile.am | 16 | ||||
| -rw-r--r-- | gdk/gdkglobals.c | 8 | ||||
| -rw-r--r-- | gdk/gdkprivate.h | 7 | ||||
| -rw-r--r-- | gdk/x11/gdkglobals-x11.c | 8 |
4 files changed, 11 insertions, 28 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 543eccb4a..19dc32531 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -59,9 +59,18 @@ gdkinclude_HEADERS = \ gdktypes.h \ gdkx.h +LDADDS = \ + @x_ldflags@ \ + @x_libs@ \ + @GLIB_LIBS@ \ + -lm + libgdk_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \ - @x_ldflags@ @x_libs@ + @GLIB_LIBS@ \ + @x_ldflags@ \ + @x_libs@ \ + -lm EXTRA_PROGRAMS = gxid @@ -69,10 +78,7 @@ bin_PROGRAMS = @xinput_progs@ gxid_SOURCES = gxid.c -gxid_LDADD = \ - @x_ldflags@ \ - @x_libs@ \ - -lm +gxid_LDADD = $(LDADDS) X-derived-headers: sed -e 's/^#define[ ]*XC\([^ ]*\)[ ]*\([^ ]*\)[ ]*.*$$/GDK\1 = \2,/' \ diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c index 125fc9211..82162c30b 100644 --- a/gdk/gdkglobals.c +++ b/gdk/gdkglobals.c @@ -62,14 +62,6 @@ GdkWindowPrivate *gdk_xgrab_window = NULL; /* Window that currently holds the * x pointer grab */ -gboolean gdk_using_threads = FALSE; - -/* Used to signal the mainloop thread from its select() */ -#ifdef USE_PTHREADS -gint gdk_threads_pipe[2]; -gboolean gdk_select_waiting = FALSE; -#endif - #ifdef USE_XIM GdkICPrivate *gdk_xim_ic; /* currently using IC */ GdkWindow *gdk_xim_window; /* currently using Window */ diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h index 07ab6b45c..bc971a097 100644 --- a/gdk/gdkprivate.h +++ b/gdk/gdkprivate.h @@ -276,7 +276,6 @@ extern gint gdk_error_code; extern gint gdk_error_warnings; extern gint gdk_null_window_warnings; extern GList *gdk_default_filters; -extern gboolean gdk_using_threads; extern const int gdk_nevent_masks; extern const int gdk_event_mask_table[]; @@ -284,12 +283,6 @@ extern GdkWindowPrivate *gdk_xgrab_window; /* Window that currently holds the * x pointer grab */ -/* Threading stuff */ -#ifdef USE_PTHREADS -extern gint gdk_threads_pipe[2]; -extern gboolean gdk_select_waiting; -#endif - #ifdef USE_XIM /* XIM support */ gint gdk_im_open (void); diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c index 125fc9211..82162c30b 100644 --- a/gdk/x11/gdkglobals-x11.c +++ b/gdk/x11/gdkglobals-x11.c @@ -62,14 +62,6 @@ GdkWindowPrivate *gdk_xgrab_window = NULL; /* Window that currently holds the * x pointer grab */ -gboolean gdk_using_threads = FALSE; - -/* Used to signal the mainloop thread from its select() */ -#ifdef USE_PTHREADS -gint gdk_threads_pipe[2]; -gboolean gdk_select_waiting = FALSE; -#endif - #ifdef USE_XIM GdkICPrivate *gdk_xim_ic; /* currently using IC */ GdkWindow *gdk_xim_window; /* currently using Window */ |