From 4a8f3f7257b870727e5477bcf478b818fcf48d90 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Sun, 11 Jan 2004 22:44:52 +0000 Subject: [PATCH] libgimpbase/gimpsignal.h removed remaining EMX ifdefs spotted by David 2004-01-11 Sven Neumann * libgimpbase/gimpsignal.h * plug-ins/gfig/gfig-preview.c: removed remaining EMX ifdefs spotted by David Odin. --- libgimpbase/gimpsignal.h | 5 ----- plug-ins/gfig/gfig-preview.c | 14 +++++++------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/libgimpbase/gimpsignal.h b/libgimpbase/gimpsignal.h index eb2ffac463..0e45c63c69 100644 --- a/libgimpbase/gimpsignal.h +++ b/libgimpbase/gimpsignal.h @@ -33,11 +33,6 @@ G_BEGIN_DECLS * ways useful to Gimp. */ -#ifdef __EMX__ -/* hope this is right for OS/2 */ -#define SA_RESTART SA_SYSV -#endif - /* GimpSignalHandlerFunc is a reference to a (signal handler) function * that takes a signal ID and returns void. * signal(2) returns such references; so does gimp_signal_private. diff --git a/plug-ins/gfig/gfig-preview.c b/plug-ins/gfig/gfig-preview.c index a765f8b3e5..86faf2158b 100644 --- a/plug-ins/gfig/gfig-preview.c +++ b/plug-ins/gfig/gfig-preview.c @@ -584,9 +584,9 @@ gfig_update_stat_labels (void) if (current_obj->filename) { - gint slen; - gchar *hm = (gchar *) g_get_home_dir (); - gchar *dfn = g_strdup (current_obj->filename); + gint slen; + const gchar *hm = g_get_home_dir (); + gchar *dfn = g_strdup (current_obj->filename); if (hm != NULL && !strncmp (dfn, hm, strlen (hm)-1)) { @@ -602,11 +602,11 @@ gfig_update_stat_labels (void) str[40] ='\0'; } else - sprintf (str, "%.40s", dfn); + { + sprintf (str, "%.40s", dfn); + } + g_free (dfn); -#ifdef __EMX__ - g_free (hm); -#endif } else sprintf (str,_(""));