use more glib macros to improve portability

2 files changed, 3 insertions, 3 deletions

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);