Changeset 10507

Timestamp:

Apr 21, 2010, 7:23:27 PM (11 years ago)

Author:

charles

Message:

(trunk gtk) add gtr_warn_if_fail(), a portability wrapper for systems too old for g_warn_if_fail()

Location:

trunk/gtk

Files:

• tr-core.c (modified) (1 diff)
• util.h (modified) (1 diff)

trunk/gtk/tr-core.c

@@ -1214 +1214 @@
         /* remove the torrent */
         tr_torrent_set_remove_flag( gtor, TRUE );
-        g_warn_if_fail( G_OBJECT( gtor )->ref_count == 1 );
+        gtr_warn_if_fail( G_OBJECT( gtor )->ref_count == 1 );
         g_object_unref( G_OBJECT( gtor ) ); /* remove the last refcount */
     }

trunk/gtk/util.h

@@ -15 +15 @@
 
 #include <sys/types.h>
+#include <glib.h>
 #include <gtk/gtk.h>
+
+/* portability wrapper around g_warn_if_fail() for older versions of glib */
+#ifdef g_warn_if_fail
+ #define gtr_warn_if_fail(expr) g_warn_if_fail(expr)
+#else
+ #define gtr_warn_if_fail(expr) do { if G_LIKELY (expr) ; else \
+                                       g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "%s:%d func(): %s: invariant failed: %s", \
+                                              __FILE__, __LINE__, G_STRFUNC, #expr ); } while(0)
+#endif
 
 /* macro to shut up "unused parameter" warnings */