From dc7d6c24645656ea1fb55d23a107e5e747b841be Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Fri, 8 Dec 2000 03:39:47 +0000 Subject: [PATCH] Don't put anything after an #endif. Likewise. * gmain.h: Don't put anything after an #endif. * gmain.c: Likewise. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gmain.c | 6 +++--- glib/gmain.h | 2 +- gmain.c | 6 +++--- gmain.h | 2 +- 12 files changed, 48 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5783b8d11..a7bf73630 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-12-07 Raja R Harinath + + * gmain.h: Don't put anything after an #endif. + * gmain.c: Likewise. + 2000-12-06 Havoc Pennington * tests/strfunc-test.c (main): add g_strdupv test diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5783b8d11..a7bf73630 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2000-12-07 Raja R Harinath + + * gmain.h: Don't put anything after an #endif. + * gmain.c: Likewise. + 2000-12-06 Havoc Pennington * tests/strfunc-test.c (main): add g_strdupv test diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5783b8d11..a7bf73630 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2000-12-07 Raja R Harinath + + * gmain.h: Don't put anything after an #endif. + * gmain.c: Likewise. + 2000-12-06 Havoc Pennington * tests/strfunc-test.c (main): add g_strdupv test diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 5783b8d11..a7bf73630 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2000-12-07 Raja R Harinath + + * gmain.h: Don't put anything after an #endif. + * gmain.c: Likewise. + 2000-12-06 Havoc Pennington * tests/strfunc-test.c (main): add g_strdupv test diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5783b8d11..a7bf73630 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2000-12-07 Raja R Harinath + + * gmain.h: Don't put anything after an #endif. + * gmain.c: Likewise. + 2000-12-06 Havoc Pennington * tests/strfunc-test.c (main): add g_strdupv test diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5783b8d11..a7bf73630 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2000-12-07 Raja R Harinath + + * gmain.h: Don't put anything after an #endif. + * gmain.c: Likewise. + 2000-12-06 Havoc Pennington * tests/strfunc-test.c (main): add g_strdupv test diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5783b8d11..a7bf73630 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2000-12-07 Raja R Harinath + + * gmain.h: Don't put anything after an #endif. + * gmain.c: Likewise. + 2000-12-06 Havoc Pennington * tests/strfunc-test.c (main): add g_strdupv test diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5783b8d11..a7bf73630 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2000-12-07 Raja R Harinath + + * gmain.h: Don't put anything after an #endif. + * gmain.c: Likewise. + 2000-12-06 Havoc Pennington * tests/strfunc-test.c (main): add g_strdupv test diff --git a/glib/gmain.c b/glib/gmain.c index fddaf1544..a197683a1 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -135,7 +135,7 @@ struct _GMainLoop #ifdef G_THREADS_ENABLED GMutex *mutex; GCond *sem_cond; -#endif G_THREADS_ENABLED +#endif /* G_THREADS_ENABLED */ }; struct _GTimeoutSource @@ -1601,7 +1601,7 @@ g_main_context_prepare (GMainContext *context, } context->poll_waiting = TRUE; -#endif G_THREADS_ENABLED +#endif /* G_THREADS_ENABLED */ #if 0 /* If recursing, finish up current dispatch, before starting over */ @@ -2003,7 +2003,7 @@ g_main_loop_new (GMainContext *context, else loop->mutex = NULL; loop->sem_cond = NULL; -#endif G_THREADS_ENABLED +#endif /* G_THREADS_ENABLED */ return loop; } diff --git a/glib/gmain.h b/glib/gmain.h index 8e4d7fce7..63574902d 100644 --- a/glib/gmain.h +++ b/glib/gmain.h @@ -279,7 +279,7 @@ gboolean g_idle_remove_by_data (gpointer data); void g_main_poll_win32_msg_add (gint priority, GPollFD *fd, guint hwnd); -#endif G_OS_WIN32 +#endif /* G_OS_WIN32 */ G_END_DECLS diff --git a/gmain.c b/gmain.c index fddaf1544..a197683a1 100644 --- a/gmain.c +++ b/gmain.c @@ -135,7 +135,7 @@ struct _GMainLoop #ifdef G_THREADS_ENABLED GMutex *mutex; GCond *sem_cond; -#endif G_THREADS_ENABLED +#endif /* G_THREADS_ENABLED */ }; struct _GTimeoutSource @@ -1601,7 +1601,7 @@ g_main_context_prepare (GMainContext *context, } context->poll_waiting = TRUE; -#endif G_THREADS_ENABLED +#endif /* G_THREADS_ENABLED */ #if 0 /* If recursing, finish up current dispatch, before starting over */ @@ -2003,7 +2003,7 @@ g_main_loop_new (GMainContext *context, else loop->mutex = NULL; loop->sem_cond = NULL; -#endif G_THREADS_ENABLED +#endif /* G_THREADS_ENABLED */ return loop; } diff --git a/gmain.h b/gmain.h index 8e4d7fce7..63574902d 100644 --- a/gmain.h +++ b/gmain.h @@ -279,7 +279,7 @@ gboolean g_idle_remove_by_data (gpointer data); void g_main_poll_win32_msg_add (gint priority, GPollFD *fd, guint hwnd); -#endif G_OS_WIN32 +#endif /* G_OS_WIN32 */ G_END_DECLS