Scilab could not build when the libxml2 was built with the icu support. 85/8585/2
Guillaume Horel [Tue, 7 Aug 2012 06:41:10 +0000 (08:41 +0200)]
(it was one of the build issue under Gentoo)

Change-Id: I49e5007aeee687586da185306a38fc6bb9e0b1ed

scilab/modules/xml/includes/xml.h
scilab/modules/xml/sci_gateway/cpp/sci_xmlRead.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlRemove.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlSetAttributes.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidate.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidationFile.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlXPath.cpp

index 620642f..8c1898c 100644 (file)
@@ -10,8 +10,6 @@
  *
  */
 
-extern "C"
-{
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xpath.h>
@@ -21,4 +19,3 @@ extern "C"
 #include <libxml/xmlschemas.h>
 #include <libxml/relaxng.h>
 #include <libxml/xmlreader.h>
-}
index 7d692e9..4fc25c7 100644 (file)
 
 #include "XMLObject.hxx"
 #include "XMLDocument.hxx"
+#include "xml.h"
 
 extern "C"
 {
-#include "xml.h"
 #include "gw_xml.h"
 #include "Scierror.h"
 #include "api_scilab.h"
index 13ff5ba..60b99d8 100644 (file)
 
 #include "XMLObject.hxx"
 #include "XMLRemovable.hxx"
+#include "xml.h"
 
 extern "C"
 {
-#include "xml.h"
 #include "gw_xml.h"
 #include "Scierror.h"
 #include "api_scilab.h"
index c5c4d25..9d1dad1 100644 (file)
  *
  */
 
+#include "xml.h"
+
 extern "C"
 {
-#include "xml.h"
 #include "gw_xml.h"
 #include "Scierror.h"
 #include "api_scilab.h"
index 19eb839..cb1b069 100644 (file)
  *
  */
 
+#include "xml.h"
+
 extern "C"
 {
-#include "xml.h"
 #include "gw_xml.h"
 #include "Scierror.h"
 #include "api_scilab.h"
index 9db61d9..2b9e046 100644 (file)
 
 #include "XMLObject.hxx"
 #include "XMLDocument.hxx"
+#include "xml.h"
 
 extern "C"
 {
-#include "xml.h"
 #include "gw_xml.h"
 #include "Scierror.h"
 #include "api_scilab.h"
index 6cda5bd..9a66fe9 100644 (file)
  *
  */
 
+#include "xml.h"
+
 extern "C"
 {
-#include "xml.h"
 #include "gw_xml.h"
 #include "Scierror.h"
 #include "api_scilab.h"