--- a/xpfe/bootstrap/nsSigHandlers.cpp
+++ b/xpfe/bootstrap/nsSigHandlers.cpp
@@ -153,17 +153,17 @@ void beos_signal_handler(int signum) {
 		exit(13);
 	}
 
 	// Exit the appshell so that the app can shutdown normally
 	appStartup->Quit(nsIAppStartup::eAttemptQuit);
 }
 #endif
 
-#ifdef MOZ_WIDGET_GTK2 && (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6))
+#if defined(MOZ_WIDGET_GTK2) && (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6))
 
 #include <glib.h>
 
 static GLogFunc orig_log_func = NULL;
 
 extern "C" {
 static void
 my_glib_log_func(const gchar *log_domain, GLogLevelFlags log_level,
@@ -250,17 +250,17 @@ void InstallUnixSignalHandlers(const cha
 	    }
     }
 #endif //SOLARIS
 
 #ifdef XP_BEOS
 	signal(SIGTERM, beos_signal_handler);
 #endif
 
-#ifdef MOZ_WIDGET_GTK2 && (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6))
+#if defined(MOZ_WIDGET_GTK2) && (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6))
   const char *assertString = PR_GetEnv("XPCOM_DEBUG_BREAK");
   if (assertString &&
       (!strcmp(assertString, "suspend") ||
        !strcmp(assertString, "stack") ||
        !strcmp(assertString, "abort") ||
        !strcmp(assertString, "trap") ||
        !strcmp(assertString, "break"))) {
     // Override the default glib logging function so we get stacks for it too.