Mercurial > vim
changeset 15412:2ba09a55bee6 v8.1.0714
patch 8.1.0714: unessesary #if lines in GTK code
commit https://github.com/vim/vim/commit/c951522943fc7c1eedaa707d2fa06da5ca17545a
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 10 22:56:30 2019 +0100
patch 8.1.0714: unessesary #if lines in GTK code
Problem: Unessesary #if lines in GTK code.
Solution: Remove the #if. (Ken Takata, closes https://github.com/vim/vim/issues/3785)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 10 Jan 2019 23:00:06 +0100 |
| parents | d927516e0c7f |
| children | aeee555c8b0d |
| files | src/gui_beval.c src/if_mzsch.c src/version.c |
| diffstat | 3 files changed, 2 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_beval.c +++ b/src/gui_beval.c @@ -60,11 +60,7 @@ static gint target_event_cb(GtkWidget *, static gint mainwin_event_cb(GtkWidget *, GdkEvent *, gpointer); static void pointer_event(BalloonEval *, int, int, unsigned); static void key_event(BalloonEval *, unsigned, int); -# if GTK_CHECK_VERSION(3,0,0) static gboolean timeout_cb(gpointer); -# else -static gint timeout_cb(gpointer); -# endif # if GTK_CHECK_VERSION(3,0,0) static gboolean balloon_draw_event_cb (GtkWidget *, cairo_t *, gpointer); # else @@ -444,11 +440,7 @@ key_event(BalloonEval *beval, unsigned k cancelBalloon(beval); } -# if GTK_CHECK_VERSION(3,0,0) static gboolean -# else - static gint -# endif timeout_cb(gpointer data) { BalloonEval *beval = (BalloonEval *)data;
--- 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)