Prepping for release.

[shibboleth/sp.git] / apache / mod_shib_13.cpp

diff --git a/apache/mod_shib_13.cpp b/apache/mod_shib_13.cpp
index 2c88023..d3c7a00 100644 (file)
--- a/apache/mod_shib_13.cpp
+++ b/apache/mod_shib_13.cpp
@@ -1,3 +1,18 @@
+/*
+ *  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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 /* mod_shib_13.cpp -- a wrapper around the apache module code to
  *                   build for Apache 1.3
@@ -6,24 +21,6 @@
  *
  */
 
-#undef _XPG4_2
-
-// SAML Runtime
-#include <saml/saml.h>
-#include <shib/shib.h>
-#include <shib/shib-threads.h>
-#include <shib-target/shib-target.h>
-#include <xercesc/util/regx/RegularExpression.hpp>
-
-// Apache specific header files
-#include <httpd.h>
-#include <http_config.h>
-#include <http_protocol.h>
-#include <http_main.h>
-#define CORE_PRIVATE
-#include <http_core.h>
-#include <http_log.h>
-
 #define SHIB_APACHE_13 1
 
 #define SH_AP_POOL pool
@@ -32,6 +29,10 @@
 #define SH_AP_R(r) r
 #define SH_AP_USER(r) r->connection->user
 
+#ifdef WIN32
+# define _USE_32BIT_TIME_T
+#endif
+
 #define apr_pool_userdata_setn(n,k,d,p)
 #define apr_pool_cleanup_register(p1,p2,f,d)