Author: nick
Date: 2007-10-22 11:16:59 +0000 (Mon, 22 Oct 2007)
New Revision: 26175
Modified:
mousepad/branches/nick_0_3/ChangeLog
mousepad/branches/nick_0_3/configure.in.in
mousepad/branches/nick_0_3/mousepad/mousepad-private.h
Log:
* configure.in.in: Make sure __OPTIMIZE__ is enable in normal builds.
* mousepad/mousepad-private.h: Tune G_LIKELY macros for pure boolean.
Modified: mousepad/branches/nick_0_3/ChangeLog
===================================================================
--- mousepad/branches/nick_0_3/ChangeLog 2007-10-22 09:18:55 UTC (rev
26174)
+++ mousepad/branches/nick_0_3/ChangeLog 2007-10-22 11:16:59 UTC (rev
26175)
@@ -1,4 +1,9 @@
2007-10-22 Nick Schermer <[EMAIL PROTECTED]>
+ * configure.in.in: Make sure __OPTIMIZE__ is enable in normal builds.
+ * mousepad/mousepad-private.h: Tune G_LIKELY macros for pure boolean.
+
+
+2007-10-22 Nick Schermer <[EMAIL PROTECTED]>
* mousepad/mousepad-window.c: Idea of the previous commit was good,
but the implementation wasn't. Fix that.
Modified: mousepad/branches/nick_0_3/configure.in.in
===================================================================
--- mousepad/branches/nick_0_3/configure.in.in 2007-10-22 09:18:55 UTC (rev
26174)
+++ mousepad/branches/nick_0_3/configure.in.in 2007-10-22 11:16:59 UTC (rev
26175)
@@ -154,6 +154,9 @@
dnl Disable object cast checks
PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
+ dnl Make sure optimization is enabled in glib macros
+ PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -D__OPTIMIZE__"
+
dnl Disable all checks for --enable-debug=no
if test x"$enable_debug" = x"no"; then
PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT
-DG_DISABLE_CHECKS"
Modified: mousepad/branches/nick_0_3/mousepad/mousepad-private.h
===================================================================
--- mousepad/branches/nick_0_3/mousepad/mousepad-private.h 2007-10-22
09:18:55 UTC (rev 26174)
+++ mousepad/branches/nick_0_3/mousepad/mousepad-private.h 2007-10-22
11:16:59 UTC (rev 26175)
@@ -72,6 +72,18 @@
#define g_value_get_object(v) (((const GValue *) (v))->data[0].v_pointer)
#endif
+/* properly set guess branch probability for pure booleans */
+#undef G_LIKELY
+#undef G_UNLIKELY
+
+#if defined(NDEBUG) && defined(__GNUC__) && (__GNUC__ > 2)
+#define G_LIKELY(expr) (__builtin_expect (!!(expr), 1))
+#define G_UNLIKELY(expr) (__builtin_expect (!!(expr), 0))
+#else
+#define G_LIKELY(expr) (expr)
+#define G_UNLIKELY(expr) (expr)
+#endif
+
G_END_DECLS
#endif /* !__MOUSEPAD_PRIVATE_H__ */
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
