X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Finternal.h;h=2392e1652504204a4e23d252d4d61fac9c3247e2;hp=9be592807f8529a43f37ec9e4764201a3f7b0a49;hb=c9e0e2dc2e15d2004333db7f135947db13956b5e;hpb=cec17382f1fd55105c849e5967d39d5d25eb2c1f

diff --git a/saml/internal.h b/saml/internal.h
index 9be5928..2392e16 100644
--- a/saml/internal.h
+++ b/saml/internal.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2005 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,8 @@
 
 #include <limits.h>
 
+using namespace xercesc;
+
 // C99 defines LLONG_MIN, LLONG_MAX and ULLONG_MAX, but this part of
 // C99 is not yet included into the C++ standard.
 // GCC defines LONG_LONG_MIN, LONG_LONG_MAX and ULONG_LONG_MAX.
@@ -73,7 +75,7 @@
 #if SIZEOF_TIME_T == 8
 # define SAMLTIME_MAX LLONG_MAX
 #elif SIZEOF_TIME_T == 4
-# define SAMLTIME_MAX LONG_MAX
+# define SAMLTIME_MAX INT_MAX
 #endif
 
 #define SAML_LOGCAT "OpenSAML"
@@ -89,8 +91,8 @@ namespace opensaml {
         static SAMLInternalConfig& getInternalConfig();
 
         // global per-process setup and shutdown of runtime
-        bool init();
-        void term();
+        bool init(bool initXMLTooling=true);
+        void term(bool termXMLTooling=true);
 
         void generateRandomBytes(void* buf, unsigned int len);
         void generateRandomBytes(std::string& buf, unsigned int len);
@@ -98,8 +100,6 @@ namespace opensaml {
         std::string hashSHA1(const char* data, bool toHex=false);
     private:
     };
-
-    void log_openssl();
     /// @endcond
 
 };