Commit: 8623e875e6aeabed0bb779a4231414f42a7e3563 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 8623e875e6aeabed0bb779a4231414f42a7e3563 (tree)
• Time: 2007-03-19 16:29:23
• Author: Hans Breuer <hans@breu...>
• Commiter: Hans Breuer

Log Message

avoid stumbling over libxml2 preprocessor tricks for LIBXML_THREAD_ENABLED

2007-03-18 Hans Breuer <[e-mail]>

* app/app_procs.c : avoid stumbling over libxml2 preprocessor
tricks for LIBXML_THREAD_ENABLED (not at all platform specific)

svn path=/trunk/; revision=3644

Change Summary

• modified: ChangeLog
• modified: app/app_procs.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-03-18  Hans Breuer  <[e-mail]>
 
+	* app/app_procs.c : avoid stumbling over libxml2 preprocessor
+	tricks for LIBXML_THREAD_ENABLED (not at all platform specific)
+
[phone]  Lars Clausen  <[e-mail]>
+
 	* NEWS: 
 	* RELEASE-PROCESS: 
 	* config.h.win32: 

--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -498,16 +498,18 @@ dump_dependencies(void)
 #endif
   {
     gchar* libxml_rt_version = "?";
-#ifdef G_OS_WIN32
+#if 0
     /* this is stupid, does not compile on Linux:
      * app_procs.c:504: error: expected identifier before '(' token
+     *
+     * In fact libxml2 has different ABI for LIBXML_THREAD_ENABLED, this code only compiles without
+     * threads enabled, but apparently it does only work when theay are.
      */
     xmlInitParser();
     if (xmlGetGlobalState())
       libxml_rt_version = xmlGetGlobalState()->xmlParserVersion;
-#else
-    libxml_rt_version = xmlParserVersion;
 #endif
+    libxml_rt_version = xmlParserVersion;
     if (atoi(libxml_rt_version))
       g_print ("libxml  : %d.%d.%d (%s)\n", 
                atoi(libxml_rt_version) / 10000, atoi(libxml_rt_version) / 100 % 100, atoi(libxml_rt_version) % 100,