[Opensync-commits] r6005 - in trunk: . opensync/common opensync/version

[<svn...@op...>]

Author: markellis
Date: Wed Jan 13 13:08:22 2010
New Revision: 6005
URL: http://www.opensync.org/changeset/6005

Log:
glib has deprecated individual includes, replaced with glib.h and check for GRegex by version

Modified:
   trunk/ChangeLog
   trunk/config.h.cmake
   trunk/opensync/common/opensync_list.c
   trunk/opensync/version/opensync_version.c

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue Jan 12 18:31:53 2010	(r6004)
+++ trunk/ChangeLog	Wed Jan 13 13:08:22 2010	(r6005)
@@ -1,3 +1,8 @@
+2010-01-13  Mark Ellis  <ma...@mp...>
+
+	* config.h.cmake,opensync/{common/opensync_list.c,version/opensync_version.c}: glib has
+	deprecated individual includes, replaced with glib.h and check for GRegex by version
+
 2010-01-10  Mark Ellis  <ma...@mp...>
 
 	* wrapper/opensync-{engine,format,group,merger,plugin,version}.i: modifications due to API

Modified: trunk/config.h.cmake
==============================================================================
--- trunk/config.h.cmake	Tue Jan 12 18:31:53 2010	(r6004)
+++ trunk/config.h.cmake	Wed Jan 13 13:08:22 2010	(r6005)
@@ -19,7 +19,6 @@
 #cmakedefine OPENSYNC_TRACE
 
 #cmakedefine HAVE_FLOCK
-#cmakedefine HAVE_GLIB_GREGEX_H
 #cmakedefine HAVE_SOLARIS
 
 #define OPENSYNC_TESTDATA "${CMAKE_CURRENT_SOURCE_DIR}/tests/data"

Modified: trunk/opensync/common/opensync_list.c
==============================================================================
--- trunk/opensync/common/opensync_list.c	Tue Jan 12 18:31:53 2010	(r6004)
+++ trunk/opensync/common/opensync_list.c	Wed Jan 13 13:08:22 2010	(r6005)
@@ -30,7 +30,7 @@
  * MT safe
  */
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include "opensync_list.h"
 #include "opensync_internals.h"
 

Modified: trunk/opensync/version/opensync_version.c
==============================================================================
--- trunk/opensync/version/opensync_version.c	Tue Jan 12 18:31:53 2010	(r6004)
+++ trunk/opensync/version/opensync_version.c	Wed Jan 13 13:08:22 2010	(r6005)
@@ -38,7 +38,7 @@
 		return 1;
 	/* Only newer versions of glib support regular expressions */
 	/* On Windows the glib regular expressions are required    */
-#ifndef HAVE_GLIB_GREGEX_H
+#if GLIB_MAJOR_VERSION < 3 && GLIB_MINOR_VERSION < 14
 	regex_t *preg = osync_try_malloc0(sizeof(regex_t), error);
 	if(!preg)
 		goto error;
@@ -82,7 +82,7 @@
  error:
 	return -1;
 
-#else /* HAVE_GLIB_GREGEX_H */
+#else /* GLIB_MAJOR_VERSION < 3 && GLIB_MINOR_VERSION < 14 */
 	return g_regex_match_simple(pattern, string, 0, 0);
 #endif
 }