X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2Finternal.h;h=b222ef4079cf7d57a69dcf0982b78e04fd653161;hb=dad9f0679e2a714ce7beddbff03acd801e52c831;hp=ffc784074baebc0fc8373a0dd5570c48e8d062c6;hpb=27e089c68c08e5f71739b5194ff311b5039e5f1c;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/internal.h b/xmltooling/internal.h
index ffc7840..b222ef4 100644
--- a/xmltooling/internal.h
+++ b/xmltooling/internal.h
@@ -47,6 +47,31 @@
 
 #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
@@ -66,7 +91,7 @@ namespace xmltooling {
         void term();
 
         // global mutex available to library applications
-        Lockable& lock();
+        Lockable* lock();
         void unlock();
 
         // configuration
@@ -83,6 +108,8 @@ namespace xmltooling {
         }
 
 #ifndef XMLTOOLING_NO_XMLSEC
+        XSECCryptoX509CRL* X509CRL() const;
+
         XSECProvider* m_xsecProvider;
 #endif
 
@@ -92,6 +119,11 @@ namespace xmltooling {
         ParserPool* m_parserPool;
         ParserPool* m_validatingPool;
     };
+    
+#ifndef XMLTOOLING_NO_XMLSEC
+    void log_openssl();
+#endif
+    
     /// @endcond
 
 };