X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fmagic.h;h=3f77d8de7be36eb78b9276f80e7f01f3b076bec0;hb=44de8692debacd87df92aa04f88941336a894ce3;hp=406b570abfe99aeab12fbdbbf37e3defe35c6e4b;hpb=78652af29a2f39e626febd5f4213da57d3a13901;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/magic.h b/libchimara/magic.h
index 406b570..3f77d8d 100644
--- a/libchimara/magic.h
+++ b/libchimara/magic.h
@@ -15,9 +15,9 @@ G_GNUC_INTERNAL gboolean magic_is_valid_or_null(const glui32 goodmagic, const gl
 G_GNUC_INTERNAL gboolean magic_is_valid(const void *obj, const glui32 goodmagic, const glui32 realmagic, const gchar *function);
 
 #define VALID_MAGIC(obj, goodmagic, die) \
-	if( !magic_is_valid(obj, goodmagic, obj->magic, G_STRFUNC) ) die
+	if( !magic_is_valid((obj), (goodmagic), (obj)? (obj)->magic : 0, G_STRFUNC) ) die
 #define VALID_MAGIC_OR_NULL(obj, goodmagic, die) \
-	if( !magic_is_valid_or_null(goodmagic, obj? obj->magic : MAGIC_NULL, G_STRFUNC) ) die
+	if( !magic_is_valid_or_null((goodmagic), (obj)? (obj)->magic : MAGIC_NULL, G_STRFUNC) ) die
 
 #define VALID_WINDOW(o, d)           VALID_MAGIC(o, MAGIC_WINDOW, d)
 #define VALID_WINDOW_OR_NULL(o, d)   VALID_MAGIC_OR_NULL(o, MAGIC_WINDOW, d)