From 4b13ed86d29dd539cb1f6f358a42336cf08e05b4 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@c-s.fr>
Date: Tue, 7 Oct 2008 15:57:41 +0100
Subject: [PATCH] COMP: Fixed compilation error on visual
---
CMakeLists.txt | 3 +++
Utilities/otbexpat/lib/xmlparse.c | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 321fcfe4c9..00b599d76a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,6 +112,9 @@ ELSE(OTB_USE_EXTERNAL_EXPAT)
ADD_DEFINITIONS(-DOTB_USE_INTERNAL_EXPAT)
INCLUDE_DIRECTORIES(BEFORE "${OTB_SOURCE_DIR}/Utilities/otbexpat")
INCLUDE_DIRECTORIES(BEFORE "${OTB_BINARY_DIR}/Utilities/otbexpat")
+ IF(NOT BUILD_SHARED_LIBS)
+ ADD_DEFINITIONS(-DXML_STATIC)
+ ENDIF(NOT BUILD_SHARED_LIBS)
ENDIF(OTB_USE_EXTERNAL_EXPAT)
#-------------------------------
diff --git a/Utilities/otbexpat/lib/xmlparse.c b/Utilities/otbexpat/lib/xmlparse.c
index 94e31de9da..94b4fc2876 100644
--- a/Utilities/otbexpat/lib/xmlparse.c
+++ b/Utilities/otbexpat/lib/xmlparse.c
@@ -21,7 +21,8 @@
#endif /* ndef COMPILED_FROM_DSP */
#include "ascii.h"
-#include "expat.h"
+// OTB Modifications
+#include "otb_expat.h"
#ifdef XML_UNICODE
#define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX
--
GitLab