[Xfce4-commits] [apps/mousepad] 08/11: Guard against multiple definitions of G_DISABLE_* macros

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

mbrush pushed a commit to branch master
in repository apps/mousepad.

commit f51894b5c7ee3e79bef448a9355128777a2505c8
Author: Matthew Brush <mbrush at codebrainz.ca>
Date:   Sat Jul 19 02:55:18 2014 -0700

    Guard against multiple definitions of G_DISABLE_* macros
    
    Not sure where else they are being defined, but the guards prevent
    lots of compiler warnings about re-defining them.
---
 mousepad/mousepad-private.h |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mousepad/mousepad-private.h b/mousepad/mousepad-private.h
index 5be9432..c095159 100644
--- a/mousepad/mousepad-private.h
+++ b/mousepad/mousepad-private.h
@@ -32,8 +32,12 @@
 
 /* In non-debug mode, turn off g_return_*()/g_assert*() debugging checks. */
 #ifdef NDEBUG
-# define G_DISABLE_CHECKS
-# define G_DISABLE_ASSERT
+# ifndef G_DISABLE_CHECKS
+#  define G_DISABLE_CHECKS
+# endif
+# ifndef G_DISABLE_ASSERT
+#  define G_DISABLE_ASSERT
+# endif
 #endif
 
 /* These are the only three headers that can be assumed to always be included

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.