From 5eb285cf1ce430dc46392e2335350858d4de6023 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Sun, 17 Jun 2012 17:52:19 +0200
Subject: use more glib macros to improve portability

---
 lib/gtk-experiment-widgets/gtk-experiment-navigator.c    | 12 ++++++------
 .../gtk-experiment-transcript-formats.c                  |  2 +-
 .../gtk-experiment-transcript-private.h                  | 14 ++++++++------
 lib/gtk-experiment-widgets/gtk-experiment-transcript.c   |  2 +-
 lib/gtk-vlc-player/gtk-vlc-player.c                      | 16 ++++++++--------
 src/experiment-player.h                                  |  4 ++--
 src/main.c                                               |  2 +-
 7 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/lib/gtk-experiment-widgets/gtk-experiment-navigator.c b/lib/gtk-experiment-widgets/gtk-experiment-navigator.c
index 206384a..8f88414 100644
--- a/lib/gtk-experiment-widgets/gtk-experiment-navigator.c
+++ b/lib/gtk-experiment-widgets/gtk-experiment-navigator.c
@@ -63,12 +63,12 @@ static inline void activate_section(GtkExperimentNavigator *navi,
  *
  * @param VAR Variable to unreference
  */
-#define GOBJECT_UNREF_SAFE(VAR) do {	\
-	if ((VAR) != NULL) {		\
-		g_object_unref(VAR);	\
-		VAR = NULL;		\
-	}				\
-} while (0)
+#define GOBJECT_UNREF_SAFE(VAR) G_STMT_START {	\
+	if ((VAR) != NULL) {			\
+		g_object_unref(VAR);		\
+		VAR = NULL;			\
+	}					\
+} G_STMT_END
 
 /** @private */
 #define GTK_EXPERIMENT_NAVIGATOR_GET_PRIVATE(obj) \
diff --git a/lib/gtk-experiment-widgets/gtk-experiment-transcript-formats.c b/lib/gtk-experiment-widgets/gtk-experiment-transcript-formats.c
index b14b770..cc2697c 100644
--- a/lib/gtk-experiment-widgets/gtk-experiment-transcript-formats.c
+++ b/lib/gtk-experiment-widgets/gtk-experiment-transcript-formats.c
@@ -105,7 +105,7 @@ gtk_experiment_transcript_parse_format(GtkExperimentTranscriptFormat *fmt,
 }
 
 /** @private */
-void
+G_GNUC_INTERNAL void
 gtk_experiment_transcript_apply_format(GtkExperimentTranscriptFormat *fmt,
 				       const gchar *text,
 				       PangoAttrList *attrib_list)
diff --git a/lib/gtk-experiment-widgets/gtk-experiment-transcript-private.h b/lib/gtk-experiment-widgets/gtk-experiment-transcript-private.h
index 7d38c32..30fc3fc 100644
--- a/lib/gtk-experiment-widgets/gtk-experiment-transcript-private.h
+++ b/lib/gtk-experiment-widgets/gtk-experiment-transcript-private.h
@@ -102,17 +102,19 @@ typedef gboolean (*GtkExperimentTranscriptContribRenderer)
  *
  * @param VAR Variable to unreference
  */
-#define GOBJECT_UNREF_SAFE(VAR) do {	\
-	if ((VAR) != NULL) {		\
-		g_object_unref(VAR);	\
-		VAR = NULL;		\
-	}				\
-} while (0)
+#define GOBJECT_UNREF_SAFE(VAR) G_STMT_START {	\
+	if ((VAR) != NULL) {			\
+		g_object_unref(VAR);		\
+		VAR = NULL;			\
+	}					\
+} G_STMT_END
 
 /** @private */
+G_GNUC_INTERNAL
 void gtk_experiment_transcript_text_layer_redraw(GtkExperimentTranscript *trans);
 
 /** @private */
+G_GNUC_INTERNAL
 void gtk_experiment_transcript_apply_format(GtkExperimentTranscriptFormat *fmt,
 					    const gchar *text,
 					    PangoAttrList *attrib_list);
diff --git a/lib/gtk-experiment-widgets/gtk-experiment-transcript.c b/lib/gtk-experiment-widgets/gtk-experiment-transcript.c
index 48b6d6e..7683a1e 100644
--- a/lib/gtk-experiment-widgets/gtk-experiment-transcript.c
+++ b/lib/gtk-experiment-widgets/gtk-experiment-transcript.c
@@ -575,7 +575,7 @@ render_backdrop_area(GtkExperimentTranscript *trans, gint64 current_time_px)
 }
 
 /** @private */
-void
+G_GNUC_INTERNAL void
 gtk_experiment_transcript_text_layer_redraw(GtkExperimentTranscript *trans)
 {
 	GtkWidget *widget = GTK_WIDGET(trans);
diff --git a/lib/gtk-vlc-player/gtk-vlc-player.c b/lib/gtk-vlc-player/gtk-vlc-player.c
index 351c7a2..20d05854 100644
--- a/lib/gtk-vlc-player/gtk-vlc-player.c
+++ b/lib/gtk-vlc-player/gtk-vlc-player.c
@@ -30,7 +30,7 @@
 #include <assert.h>
 
 #include <gtk/gtk.h>
-#ifdef __WIN32__
+#ifdef G_OS_WIN32
 #include <gdk/gdkwin32.h>
 #else
 #include <gdk/gdkx.h>
@@ -63,12 +63,12 @@ static void vlc_length_changed(const struct libvlc_event_t *event, void *userdat
 static void vlc_player_load_media(GtkVlcPlayer *player, libvlc_media_t *media);
 
 /** @private */
-#define GOBJECT_UNREF_SAFE(VAR) do {	\
-	if ((VAR) != NULL) {		\
-		g_object_unref(VAR);	\
-		VAR = NULL;		\
-	}				\
-} while (0)
+#define GOBJECT_UNREF_SAFE(VAR) G_STMT_START {	\
+	if ((VAR) != NULL) {			\
+		g_object_unref(VAR);		\
+		VAR = NULL;			\
+	}					\
+} G_STMT_END
 
 /** @private */
 #define GTK_VLC_PLAYER_GET_PRIVATE(obj) \
@@ -252,7 +252,7 @@ widget_on_realize(GtkWidget *widget, gpointer user_data)
 	GtkVlcPlayer *player = GTK_VLC_PLAYER(user_data);
 	GdkWindow *window = gtk_widget_get_window(widget);
 
-#ifdef __WIN32__
+#ifdef G_OS_WIN32
 	libvlc_media_player_set_hwnd(player->priv->media_player,
 				     GDK_WINDOW_HWND(window));
 #else
diff --git a/src/experiment-player.h b/src/experiment-player.h
index 5775592..0096b7a 100644
--- a/src/experiment-player.h
+++ b/src/experiment-player.h
@@ -214,9 +214,9 @@ extern GtkWidget *transcript_wizard_combo,
  * macros and inline functions
  */
 /** @private */
-#define BUILDER_INIT(BUILDER, VAR) do {					\
+#define BUILDER_INIT(BUILDER, VAR) G_STMT_START {			\
 	VAR = GTK_WIDGET(gtk_builder_get_object(BUILDER, #VAR));	\
-} while (0)
+} G_STMT_END
 
 /** @public */
 static inline gchar *
diff --git a/src/main.c b/src/main.c
index 3e09a8b..85d9372 100644
--- a/src/main.c
+++ b/src/main.c
@@ -369,7 +369,7 @@ main(int argc, char *argv[])
 	GtkRcStyle *modified_style;
 
 	/* FIXME: support internationalization instead of enforcing English */
-#ifdef __WIN32__
+#ifdef G_OS_WIN32
 	g_setenv("LC_ALL", "English", TRUE);
 #else
 	g_setenv("LC_ALL", "en", TRUE);
-- 
cgit v1.2.3