提交: 38fb222f1d6213f38cfc139fee5c39fd6510a9df - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修订版: 38fb222f1d6213f38cfc139fee5c39fd6510a9df (tree)
• 时间: 2007-03-19 02:41:19
• 作者: Hans Breuer <hans@breu...>
• Commiter: Hans Breuer

Log Message

portability fixes

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

* app/app_procs.c plug-ins/wmf/wmf.cpp : portability fixes

svn path=/trunk/; revision=3642

更改概述

• modified: ChangeLog
• modified: app/app_procs.c
• modified: plug-ins/wmf/wmf.cpp

差异

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
[phone]  Hans Breuer  <[e-mail]>
+
+	* app/app_procs.c plug-ins/wmf/wmf.cpp : portability fixes
+
 2007-03-17  Hans Breuer  <[e-mail]>
 
 	* app/app_procs.c app/autosave.c app/commands.c app/diaconv.c

--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -497,10 +497,17 @@ dump_dependencies(void)
   }
 #endif
   {
-    gchar* libxml_rt_version   = "?";
+    gchar* libxml_rt_version = "?";
+#ifdef G_OS_WIN32
+    /* this is stupid, does not compile on Linux:
+     * app_procs.c:504: error: expected identifier before '(' token
+     */
     xmlInitParser();
     if (xmlGetGlobalState())
       libxml_rt_version = xmlGetGlobalState()->xmlParserVersion;
+#else
+    libxml_rt_version = xmlParserVersion;
+#endif
     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,

--- a/plug-ins/wmf/wmf.cpp
+++ b/plug-ins/wmf/wmf.cpp
@@ -1185,7 +1185,7 @@ export_data(DiagramData *data, const gchar *filename,
 
     if (file == NULL) {
         message_error(_("Couldn't open: '%s' for writing.\n"), 
-	              dia_message_filename(filename), strerror(errno));
+	              dia_message_filename(filename));
         return;
     }