summaryrefslogtreecommitdiffstats
path: root/src/if_mzsch.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-10 22:56:30 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-10 22:56:30 +0100
commitc951522943fc7c1eedaa707d2fa06da5ca17545a (patch)
treee33897cbf796757c8935488dfc458caec28adece /src/if_mzsch.c
parent24877cf22c59acefc69c33d8368841a149135fed (diff)
patch 8.1.0714: unessesary #if lines in GTK codev8.1.0714
Problem: Unessesary #if lines in GTK code. Solution: Remove the #if. (Ken Takata, closes #3785)
Diffstat (limited to 'src/if_mzsch.c')
-rw-r--r--src/if_mzsch.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 41cecb1220..ddd3852556 100644
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -811,11 +811,7 @@ static int mz_threads_allow = 0;
static void CALLBACK timer_proc(HWND, UINT, UINT_PTR, DWORD);
static UINT timer_id = 0;
#elif defined(FEAT_GUI_GTK)
-# if GTK_CHECK_VERSION(3,0,0)
static gboolean timer_proc(gpointer);
-# else
-static gint timer_proc(gpointer);
-# endif
static guint timer_id = 0;
#elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
static void timer_proc(XtPointer, XtIntervalId *);
@@ -855,11 +851,7 @@ static void remove_timer(void);
static void CALLBACK
timer_proc(HWND hwnd UNUSED, UINT uMsg UNUSED, UINT_PTR idEvent UNUSED, DWORD dwTime UNUSED)
# elif defined(FEAT_GUI_GTK)
-# if GTK_CHECK_VERSION(3,0,0)
static gboolean
-# else
- static gint
-# endif
timer_proc(gpointer data UNUSED)
# elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
static void
@@ -886,11 +878,7 @@ setup_timer(void)
# if defined(FEAT_GUI_W32)
timer_id = SetTimer(NULL, 0, p_mzq, timer_proc);
# elif defined(FEAT_GUI_GTK)
-# if GTK_CHECK_VERSION(3,0,0)
timer_id = g_timeout_add((guint)p_mzq, (GSourceFunc)timer_proc, NULL);
-# else
- timer_id = gtk_timeout_add((guint32)p_mzq, (GtkFunction)timer_proc, NULL);
-# endif
# elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
timer_id = XtAppAddTimeOut(app_context, p_mzq, timer_proc, NULL);
# elif defined(FEAT_GUI_MAC)
@@ -906,11 +894,7 @@ remove_timer(void)
# if defined(FEAT_GUI_W32)
KillTimer(NULL, timer_id);
# elif defined(FEAT_GUI_GTK)
-# if GTK_CHECK_VERSION(3,0,0)
g_source_remove(timer_id);
-# else
- gtk_timeout_remove(timer_id);
-# endif
# elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
XtRemoveTimeOut(timer_id);
# elif defined(FEAT_GUI_MAC)