Merge branch 'upstream' into tizen

[platform/upstream/glib.git] / glib / glib-autocleanups.h

diff --git a/glib/glib-autocleanups.h b/glib/glib-autocleanups.h
index 6457eaf..9248c61 100644 (file)
--- a/glib/glib-autocleanups.h
+++ b/glib/glib-autocleanups.h
@@ -29,10 +29,10 @@ g_autoptr_cleanup_generic_gfree (void *p)
 }
 
 static inline void
-g_autoptr_cleanup_gstring_free (GString *string)
+g_autoptr_cleanup_gstring_free (GString *__string__)
 {
-  if (string)
-    g_string_free (string, TRUE);
+  if (__string__)
+    g_string_free (__string__, TRUE);
 }
 
 /* Ignore deprecations in case we refer to a type which was added in a more