Fixed gcc build

This commit is contained in:
Yevgen Muntyan 2010-02-16 02:34:01 -08:00
parent 5418c1ed54
commit 6b4392c717
3 changed files with 14 additions and 13 deletions

View File

@ -8,7 +8,11 @@ build/
*.bak
*.pyc
*.tmp
*.gmo
*.stamp
*-gxml.h
*~
*.a
.DS_Store
Makefile.in
*-enums.[ch]
@ -22,6 +26,10 @@ doc/help/*.html
doc/help.html
doc/help-sections.h
doc/medit.1
CMakeFiles/
Makefile
cmake_install.cmake
moo/mooedit/gtksourceview/*-mangled.*
syntax: regexp
^po(-gsv)?/(Makefile\.in\.in|dist|missing|notexist|pot|intltool-update)$

View File

@ -80,16 +80,11 @@ G_STMT_START { \
} \
} G_STMT_END
gboolean moo_debug_enabled (const char *var,
gboolean def_enabled);
void _moo_set_debug (const char *domains);
#elif defined(MOO_CL_GCC)
#define MOO_DEBUG_INIT(domain, def_enabled)
#define moo_dmsg(format, args...) G_STMT_START {} G_STMT_END
#define moo_dprint(format, args...) G_STMT_START {} G_STMT_END
#define moo_debug(format, args...) G_STMT_START {} G_STMT_END
#define MOO_DEBUG_CODE(whatever) G_STMT_START {} G_STMT_END
#else /* not gcc, not DEBUG */
@ -105,16 +100,14 @@ static void moo_dprint (const char *format, ...) G_GNUC_PRINTF(1,2)
{
}
static void moo_debug_dummy (const char *format, ...) G_GNUC_PRINTF(1,2)
{
}
#define moo_debug moo_debug_dummy
#endif /* gcc or DEBUG */
#define _moo_message moo_debug
gboolean moo_debug_enabled (const char *var,
gboolean def_enabled);
void _moo_set_debug (const char *domains);
G_END_DECLS
#endif /* MOO_UTILS_DEBUG_H */

View File

@ -53,13 +53,13 @@ do { \
#ifdef DEBUG
#define _MOO_DEBUG_ASSERT _MOO_ASSERT_CHECK
#define _MOO_DEBUG_ASSERT_NOT_REACHED() _MOO_ASSERT_MESSAGE ("should not be reached")
#define _MOO_DEBUG_SIDE_ASSERT(what) do { gboolean res__ = (what); _MOO_DEBUG_ASSERT(res__); } while (0)
#else
#define _MOO_DEBUG_ASSERT(cond) MOO_VOID_STMT
#define _MOO_DEBUG_ASSERT_NOT_REACHED() MOO_VOID_STMT
#define _MOO_DEBUG_SIDE_ASSERT(what) MOO_VOID_STMT
#endif
#define _MOO_DEBUG_SIDE_ASSERT(what) do { gboolean res__ = (what); _MOO_DEBUG_ASSERT(res__); } while (0)
#define moo_assert _MOO_DEBUG_ASSERT
#define moo_side_assert _MOO_DEBUG_SIDE_ASSERT
#define moo_release_assert _MOO_RELEASE_ASSERT