[Freeciv-commits] r31688 - in /branches/S2_6: ./ gen_headers/ utility/

[cazfi74]

Author: cazfi
Date: Sun Jan 31 15:14:52 2016
New Revision: 31688

URL: http://svn.gna.org/viewcvs/freeciv?rev=31688&view=rev
Log:
Made FREECIV_HAVE_XML_REGISTRY public in freeciv_config.h

See patch #6868

Modified:
    branches/S2_6/configure.ac
    branches/S2_6/gen_headers/freeciv_config.h.in
    branches/S2_6/utility/registry.c
    branches/S2_6/utility/registry_xml.c
    branches/S2_6/utility/registry_xml.h

Modified: branches/S2_6/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=31688&r1=31687&r2=31688&view=diff
==============================================================================
--- branches/S2_6/configure.ac  (original)
+++ branches/S2_6/configure.ac  Sun Jan 31 15:14:52 2016
@@ -635,7 +635,7 @@
       [AC_MSG_ERROR([libxml2 development files required])])
   UTILITY_CFLAGS="${UTILITY_CFLAGS} ${LIBXML2_CFLAGS}"
   UTILITY_LIBS="${UTILITY_LIBS} ${LIBXML2_LIBS}"
-  AC_DEFINE([HAVE_XML_REGISTRY], [1], [Build xml-backend for registry])
+  AC_DEFINE([FREECIV_HAVE_XML_REGISTRY], [1], [Build xml-backend for registry])
 fi
 
 dnl Set debug flags supported by compiler

Modified: branches/S2_6/gen_headers/freeciv_config.h.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/gen_headers/freeciv_config.h.in?rev=31688&r1=31687&r2=31688&view=diff
==============================================================================
--- branches/S2_6/gen_headers/freeciv_config.h.in       (original)
+++ branches/S2_6/gen_headers/freeciv_config.h.in       Sun Jan 31 15:14:52 2016
@@ -34,6 +34,9 @@
 
 /* Has thread condition variable implementation */
 #undef FREECIV_HAVE_THREAD_COND
+
+/* Build xml-backend for registry */
+#undef FREECIV_HAVE_XML_REGISTRY
 
 /* Native language support enabled */
 #undef FREECIV_ENABLE_NLS

Modified: branches/S2_6/utility/registry.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/registry.c?rev=31688&r1=31687&r2=31688&view=diff
==============================================================================
--- branches/S2_6/utility/registry.c    (original)
+++ branches/S2_6/utility/registry.c    Sun Jan 31 15:14:52 2016
@@ -16,9 +16,9 @@
 #endif
 
 /* libxml2 */
-#ifdef HAVE_XML_REGISTRY
+#ifdef FREECIV_HAVE_XML_REGISTRY
 #include <libxml/parser.h>
-#endif /* HAVE_XML_REGISTRY */
+#endif /* FREECIV_HAVE_XML_REGISTRY */
 
 #include "registry_xml.h"
 
@@ -29,9 +29,9 @@
 *************************************************************************/
 void registry_module_init(void)
 {
-#ifdef HAVE_XML_REGISTRY
+#ifdef FREECIV_HAVE_XML_REGISTRY
   LIBXML_TEST_VERSION;
-#endif /* HAVE_XML_REGISTRY */
+#endif /* FREECIV_HAVE_XML_REGISTRY */
 }
 
 /*************************************************************************
@@ -39,9 +39,9 @@
 *************************************************************************/
 void registry_module_close(void)
 {
-#ifdef HAVE_XML_REGISTRY
+#ifdef FREECIV_HAVE_XML_REGISTRY
   xmlCleanupParser();
-#endif /* HAVE_XML_REGISTRY */
+#endif /* FREECIV_HAVE_XML_REGISTRY */
 }
 
 /**************************************************************************
@@ -50,14 +50,14 @@
 struct section_file *secfile_load(const char *filename,
                                   bool allow_duplicates)
 {
-#ifdef HAVE_XML_REGISTRY
+#ifdef FREECIV_HAVE_XML_REGISTRY
   xmlDoc *sec_doc;
 
   sec_doc = xmlReadFile(filename, NULL, XML_PARSE_NOERROR);
   if (sec_doc != NULL) {
     return xmlfile_load(sec_doc, filename);
   }
-#endif /* HAVE_XML_REGISTRY */
+#endif /* FREECIV_HAVE_XML_REGISTRY */
 
   return secfile_load_section(filename, NULL, allow_duplicates);
 }

Modified: branches/S2_6/utility/registry_xml.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/registry_xml.c?rev=31688&r1=31687&r2=31688&view=diff
==============================================================================
--- branches/S2_6/utility/registry_xml.c        (original)
+++ branches/S2_6/utility/registry_xml.c        Sun Jan 31 15:14:52 2016
@@ -15,7 +15,7 @@
 #include <fc_config.h>
 #endif
 
-#ifdef HAVE_XML_REGISTRY
+#ifdef FREECIV_HAVE_XML_REGISTRY
 
 #include <libxml/parser.h>
 
@@ -117,4 +117,4 @@
   return secfile;
 }
 
-#endif /* HAVE_XML_REGISTRY */
+#endif /* FREECIV_HAVE_XML_REGISTRY */

Modified: branches/S2_6/utility/registry_xml.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/registry_xml.h?rev=31688&r1=31687&r2=31688&view=diff
==============================================================================
--- branches/S2_6/utility/registry_xml.h        (original)
+++ branches/S2_6/utility/registry_xml.h        Sun Jan 31 15:14:52 2016
@@ -17,13 +17,13 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#ifdef HAVE_XML_REGISTRY
+#ifdef FREECIV_HAVE_XML_REGISTRY
 
 #define FCXML_CAPSTR "+xml"
 
 struct section_file *xmlfile_load(xmlDoc *sec_doc, const char *filename);
 
-#endif /* HAVE_XML_REGISTRY */
+#endif /* FREECIV_HAVE_XML_REGISTRY */
 
 #ifdef __cplusplus
 }


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits