diff -u gio.orig/gbufferedinputstream.c gio/gbufferedinputstream.c
--- gio.orig/gbufferedinputstream.c	2008-02-06 04:18:55.000000000 +0900
+++ gio/gbufferedinputstream.c	2008-02-08 23:28:18.000000000 +0900
@@ -481,7 +481,7 @@
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
 					   _("Too large count value passed to %s"),
-					   __FUNCTION__);
+					   G_STRFUNC);
       return;
     }
   
diff -u gio.orig/ginputstream.c gio/ginputstream.c
--- gio.orig/ginputstream.c	2008-02-06 04:18:54.000000000 +0900
+++ gio/ginputstream.c	2008-02-08 23:28:16.000000000 +0900
@@ -183,7 +183,7 @@
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-		   _("Too large count value passed to %s"), __FUNCTION__);
+		   _("Too large count value passed to %s"), G_STRFUNC);
       return -1;
     }
 
@@ -315,7 +315,7 @@
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-		   _("Too large count value passed to %s"), __FUNCTION__);
+		   _("Too large count value passed to %s"), G_STRFUNC);
       return -1;
     }
   
@@ -557,7 +557,7 @@
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
 					   _("Too large count value passed to %s"),
-					   __FUNCTION__);
+					   G_STRFUNC);
       return;
     }
 
@@ -682,7 +682,7 @@
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
 					   _("Too large count value passed to %s"),
-					   __FUNCTION__);
+					   G_STRFUNC);
       return;
     }
 
diff -u gio.orig/goutputstream.c gio/goutputstream.c
--- gio.orig/goutputstream.c	2008-02-06 04:18:54.000000000 +0900
+++ gio/goutputstream.c	2008-02-08 23:28:14.000000000 +0900
@@ -190,7 +190,7 @@
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-		   _("Too large count value passed to %s"), __FUNCTION__);
+		   _("Too large count value passed to %s"), G_STRFUNC);
       return -1;
     }
 
@@ -645,7 +645,7 @@
 					   user_data,
 					   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
 					   _("Too large count value passed to %s"),
-					   __FUNCTION__);
+					   G_STRFUNC);
       return;
     }
 
