diff --git a/glib/gscanner.c b/glib/gscanner.c
index dd95b71a9..c0bef30dd 100644
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -143,7 +143,7 @@ static guchar	g_scanner_get_char	  (GScanner	*scanner,
 					   guint	*position_p);
 static void	g_scanner_msg_handler	  (GScanner	*scanner,
 					   gchar	*message,
-					   gint		 is_error);
+					   gboolean	 is_error);
 
 
 /* --- functions --- */
@@ -285,7 +285,7 @@ g_scanner_destroy (GScanner	*scanner)
 static void
 g_scanner_msg_handler (GScanner		*scanner,
 		       gchar		*message,
-		       gint		 is_error)
+		       gboolean		is_error)
 {
   g_return_if_fail (scanner != NULL);
   
diff --git a/glib/gscanner.h b/glib/gscanner.h
index 951d3ff20..2d2062b98 100644
--- a/glib/gscanner.h
+++ b/glib/gscanner.h
@@ -37,7 +37,7 @@ typedef union  _GTokenValue     GTokenValue;
 
 typedef void		(*GScannerMsgFunc)	(GScanner      *scanner,
 						 gchar	       *message,
-						 gint		error);
+						 gboolean	error);
 
 /* GScanner: Flexible lexical scanner for general purpose.
  */
@@ -244,6 +244,9 @@ void		g_scanner_error			(GScanner	*scanner,
 void		g_scanner_warn			(GScanner	*scanner,
 						 const gchar	*format,
 						 ...) G_GNUC_PRINTF (2,3);
+
+#ifndef G_DISABLE_DEPRECATED
+
 /* keep downward source compatibility */
 #define		g_scanner_add_symbol( scanner, symbol, value )	G_STMT_START { \
   g_scanner_scope_add_symbol ((scanner), 0, (symbol), (value)); \
@@ -255,8 +258,6 @@ void		g_scanner_warn			(GScanner	*scanner,
   g_scanner_scope_foreach_symbol ((scanner), 0, (func), (data)); \
 } G_STMT_END
 
-#ifndef G_DISABLE_DEPRECATED
-
 /* The following two functions are deprecated and will be removed in
  * the next major release. They do no good. */
 #define g_scanner_freeze_symbol_table(scanner) ((void)0)