Reduce code duplication -- move the headers into the common file

diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp
index 3e54e2f..386b8e7 100644 (file)
--- a/apache/mod_apache.cpp
+++ b/apache/mod_apache.cpp
@@ -6,6 +6,30 @@
  * $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>
+
+#undef _XPG4_2
+
+// 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>
+
+#ifndef SHIB_APACHE_13
+#include <http_request.h>
+#include <apr_strings.h>
+#include <apr_pools.h>
+#endif
+
 #include <fstream>
 #include <sstream>
 

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

diff --git a/apache/mod_shib_20.cpp b/apache/mod_shib_20.cpp
index 5b2f63b..df5f68d 100644 (file)
--- a/apache/mod_shib_20.cpp
+++ b/apache/mod_shib_20.cpp
@@ -6,25 +6,6 @@
  *
  */
 
-// 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>
-#include <http_request.h>
-#include <apr_strings.h>
-#define CORE_PRIVATE
-#include <http_core.h>
-#include <http_log.h>
-#include <apr_pools.h>
-
 #define SHIB_APACHE_20 1
 
 #define MODULE_VAR_EXPORT AP_MODULE_DECLARE_DATA