Moved our headers into the per-version files above the Apache headers

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@925 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp
index 6ca7188..3e54e2f 100644 (file)
--- a/apache/mod_apache.cpp
+++ b/apache/mod_apache.cpp
@@ -6,13 +6,6 @@
  * $Id$
  */
 
-// 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>
-
 #include <fstream>
 #include <sstream>
 

diff --git a/apache/mod_shib_13.cpp b/apache/mod_shib_13.cpp
index 3d976df..2c88023 100644 (file)
--- a/apache/mod_shib_13.cpp
+++ b/apache/mod_shib_13.cpp
@@ -8,6 +8,13 @@
 
 #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>

diff --git a/apache/mod_shib_20.cpp b/apache/mod_shib_20.cpp
index 928f232..5b2f63b 100644 (file)
--- a/apache/mod_shib_20.cpp
+++ b/apache/mod_shib_20.cpp
@@ -6,6 +6,13 @@
  *
  */
 
+// 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>