Attempt to handle xmlsec versions where xsecsize_t doesn't exist.

diff --git a/config_win32.h b/config_win32.h
index 2a24c04..d2c25c1 100644 (file)
--- a/config_win32.h
+++ b/config_win32.h
@@ -74,6 +74,9 @@
 # define XMLTOOLING_XERCESC_INPUTSTREAM_HAS_CONTENTTYPE 1
 #endif
 
+/* Define to 1 if you have the `xsecsize_t' type. */
+#define HAVE_XSECSIZE_T 1
+
 /* Name of package */
 #define PACKAGE "xmltooling"
 

diff --git a/configure.ac b/configure.ac
index 7c7d1a1..ec8ed09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -288,6 +288,8 @@ int i = 0;
             [#include <xsec/utils/XSECPlatformUtils.hpp>],
             [XSECPlatformUtils::Initialise()],,
             [AC_MSG_ERROR([unable to link with XML-Security])])
+    AC_MSG_CHECKING([xsecsize_t])
+    AC_CHECK_TYPE([xsecsize_t],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
        # restore master libs
        LIBS="$save_LIBS"

diff --git a/xmltooling/base.h b/xmltooling/base.h
index 30db50d..2956172 100644 (file)
--- a/xmltooling/base.h
+++ b/xmltooling/base.h
@@ -39,7 +39,7 @@
 # define XMLTOOLING_NO_XMLSEC 1\r
 #endif\r
 \r
-#ifdef XMLTOOLING_NO_XMLSEC\r
+#if defined(XMLTOOLING_NO_XMLSEC) || !defined(HAVE_XSECSIZE_T)\r
 # ifdef XMLTOOLING_XERCESC_64BITSAFE\r
 #   include <xercesc/util/XercesDefs.hpp>\r
     typedef XMLSize_t xsecsize_t;\r

diff --git a/xmltooling/config_pub.h.in b/xmltooling/config_pub.h.in
index b14839a..736d7ec 100644 (file)
--- a/xmltooling/config_pub.h.in
+++ b/xmltooling/config_pub.h.in
@@ -26,3 +26,6 @@
 
 /* Define to 1 if Xerces has a 64-bit-safe API. */
 #undef XMLTOOLING_XERCESC_64BITSAFE
+
+/* Define to 1 if you have the `xsecsize_t' type. */
+#undef HAVE_XSECSIZE_T

diff --git a/xmltooling/config_pub_win32.h b/xmltooling/config_pub_win32.h
index 6c00991..2652bb9 100644 (file)
--- a/xmltooling/config_pub_win32.h
+++ b/xmltooling/config_pub_win32.h
@@ -28,3 +28,6 @@
 # define XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE  1
 # define XMLTOOLING_XERCESC_64BITSAFE           1
 #endif
+
+/* Define to 1 if you have the `xsecsize_t' type. */
+#define HAVE_XSECSIZE_T 1