Support for a catalog path.

[shibboleth/cpp-xmltooling.git] / xmltooling / internal.h

diff --git a/xmltooling/internal.h b/xmltooling/internal.h
index ab48364..b222ef4 100644 (file)
--- a/xmltooling/internal.h
+++ b/xmltooling/internal.h
@@ -26,6 +26,9 @@
 # define _CRT_NONSTDC_NO_DEPRECATE 1
 #endif
 
+// Export public APIs.
+#define XMLTOOLING_EXPORTS
+
 // eventually we might be able to support autoconf via cygwin...
 #if defined (_MSC_VER) || defined(__BORLANDC__)
 # include "config_win32.h"
@@ -44,13 +47,38 @@
 
 #define XMLTOOLING_LOGCAT "XMLTooling"
 
+// Macros for path and directory separators.
+#if defined __CYGWIN32__ && !defined __CYGWIN__
+   /* For backwards compatibility with Cygwin b19 and
+      earlier, we define __CYGWIN__ here, so that
+      we can rely on checking just for that macro. */
+#  define __CYGWIN__  __CYGWIN32__
+#endif
+
+#if defined _WIN32 && !defined __CYGWIN__
+   /* Use Windows separators on all _WIN32 defining
+      environments, except Cygwin. */
+#  define DIR_SEPARATOR_CHAR        '\\'
+#  define DIR_SEPARATOR_STR         "\\"
+#  define PATH_SEPARATOR_CHAR       ';'
+#  define PATH_SEPARATOR_STR        ";"
+#endif
+#ifndef DIR_SEPARATOR_CHAR
+   /* Assume that not having this is an indicator that all
+      are missing. */
+#  define DIR_SEPARATOR_CHAR        '/'
+#  define DIR_SEPARATOR_STR         "/"
+#  define PATH_SEPARATOR_CHAR       ':'
+#  define PATH_SEPARATOR_STR        ":"
+#endif /* !DIR_SEPARATOR_CHAR */
+
 namespace xmltooling {
     
     /// @cond OFF
     class XMLToolingInternalConfig : public xmltooling::XMLToolingConfig
     {
     public:
-        XMLToolingInternalConfig() : m_parserPool(NULL), m_lock(NULL) {
+        XMLToolingInternalConfig() : m_lock(NULL), m_parserPool(NULL), m_validatingPool(NULL) {
 #ifndef XMLTOOLING_NO_XMLSEC
             m_xsecProvider=NULL;
 #endif
@@ -63,24 +91,39 @@ namespace xmltooling {
         void term();
 
         // global mutex available to library applications
-        xmltooling::ILockable& lock();
+        Lockable* lock();
         void unlock();
 
         // configuration
         bool load_library(const char* path, void* context=NULL);
         bool log_config(const char* config=NULL);
 
-        // internal parser pool
-        xmltooling::ParserPool* m_parserPool;
+        // parser access
+        ParserPool& getParser() const {
+            return *m_parserPool;
+        }
+
+        ParserPool& getValidatingParser() const {
+            return *m_validatingPool;
+        }
+
 #ifndef XMLTOOLING_NO_XMLSEC
+        XSECCryptoX509CRL* X509CRL() const;
+
         XSECProvider* m_xsecProvider;
 #endif
 
     private:
         std::vector<void*> m_libhandles;
         void* m_lock;
-        //PlugManager m_plugMgr;
+        ParserPool* m_parserPool;
+        ParserPool* m_validatingPool;
     };
+    
+#ifndef XMLTOOLING_NO_XMLSEC
+    void log_openssl();
+#endif
+    
     /// @endcond
 
 };