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-vlc-player/gtk-vlc-player.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/gtk-vlc-player/gtk-vlc-player.c')

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
-- 
cgit v1.2.3