diff options
| author | Eric Warmenhoven <eric@warmenhoven.org> | 2002-11-08 00:19:24 +0000 |
|---|---|---|
| committer | Eric Warmenhoven <warmenhoven@src.gnome.org> | 2002-11-08 00:19:24 +0000 |
| commit | 0202f67266228ffb9592eef619c781b9587b1b3c (patch) | |
| tree | 24ddb7e95da91a9cf2a133b3fece5f9931398e69 /gdk | |
| parent | ba64031dd7b4069938660886b1d2a148baafd562 (diff) | |
| download | gdk-pixbuf-0202f67266228ffb9592eef619c781b9587b1b3c.tar.gz | |
fix compilation
Thu Nov 7 16:13:41 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/linux-fb/gdkscreen-fb.c: fix compilation
* gdk/linux-fb/gdkmain-fb.c: prevent segfaults on shutdown
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/linux-fb/gdkmain-fb.c | 8 | ||||
| -rw-r--r-- | gdk/linux-fb/gdkscreen-fb.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gdk/linux-fb/gdkmain-fb.c b/gdk/linux-fb/gdkmain-fb.c index 2325d5734..ec4f3f080 100644 --- a/gdk/linux-fb/gdkmain-fb.c +++ b/gdk/linux-fb/gdkmain-fb.c @@ -38,6 +38,7 @@ #include <sys/vt.h> #include <sys/kd.h> #include <errno.h> +#include <signal.h> #include <sys/socket.h> #include <sys/un.h> @@ -1252,6 +1253,13 @@ extern void keyboard_shutdown(void); void _gdk_windowing_exit (void) { + struct sigaction action; + + /* don't get interrupted while exiting + * (cf. gdkrender-fb.c:gdk_shadow_fb_init) */ + action.sa_handler = SIG_IGN; + sigemptyset (&action.sa_mask); + action.sa_flags = 0; gdk_fb_mouse_close (); /*leak g_free (gdk_fb_mouse);*/ diff --git a/gdk/linux-fb/gdkscreen-fb.c b/gdk/linux-fb/gdkscreen-fb.c index a5914734b..ece7cf234 100644 --- a/gdk/linux-fb/gdkscreen-fb.c +++ b/gdk/linux-fb/gdkscreen-fb.c @@ -80,8 +80,8 @@ gdk_screen_get_number (GdkScreen *screen) } gchar * -_gdk_windowing_substitute_screen_number (gchar *display_name, - int screen_number) +_gdk_windowing_substitute_screen_number (const gchar *display_name, + int screen_number) { return g_strdup (display_name); } |