/pidgin/main: 44c5f3ab8ffc: Remove unncessary GLIB_CHECK_VERSION...

Mark Doliner mark at kingant.net
Thu Jan 10 02:59:22 EST 2013


Changeset: 44c5f3ab8ffc1d961ba578a22da36dc280ef818f
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2013-01-09 23:59 -0800
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/44c5f3ab8ffc

Description:

Remove unncessary GLIB_CHECK_VERSION(2, 20, 0) and fix a bug.

This file had CHECK(2.28.0) nested instead CHECK(2.20.0), which
is wrong.  It should be the other way around.

This broke compilation for anying with glib between 2.20 through 2.27,
and is the reason bug #15310 was still a problem for some people.

Fixes #15310

diffstat:

 libpurple/glibcompat.h |  5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diffs (21 lines):

diff --git a/libpurple/glibcompat.h b/libpurple/glibcompat.h
--- a/libpurple/glibcompat.h
+++ b/libpurple/glibcompat.h
@@ -25,10 +25,6 @@
  * Also, any public API should not depend on this file.
  */
 
-#if !GLIB_CHECK_VERSION(2, 20, 0)
-
-#define G_OFFSET_FORMAT G_GINT64_FORMAT
-
 #if !GLIB_CHECK_VERSION(2, 28, 0)
 
 static inline gint64 g_get_monotonic_time(void)
@@ -53,6 +49,5 @@ static inline void g_slist_free_full(GSL
 }
 
 #endif /* 2.28.0 */
-#endif /* 2.20.0 */
 
 #endif /* _PIDGINGLIBCOMPAT_H_ */



More information about the Commits mailing list