VS10 solution files, convert from NULL macro to nullptr.

[shibboleth/cpp-sp.git] / apache / mod_shib_20.cpp

diff --git a/apache/mod_shib_20.cpp b/apache/mod_shib_20.cpp
index 247af2f..c4260c1 100644 (file)
--- a/apache/mod_shib_20.cpp
+++ b/apache/mod_shib_20.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2005 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 
 #define SH_AP_R(r) 0,r
 #define SH_AP_USER(r) r->user
+#define SH_AP_AUTH_TYPE(r) r->ap_auth_type
 
 #define SERVER_ERROR HTTP_INTERNAL_SERVER_ERROR
 #define REDIRECT HTTP_MOVED_TEMPORARILY
@@ -47,10 +48,12 @@
 #define ap_clear_pool apr_pool_clear
 #define ap_destroy_pool apr_pool_destroy
 #define ap_make_table apr_table_make
+#define ap_copy_table apr_table_copy
 #define ap_overlay_tables apr_table_overlay
+#define ap_overlap_tables apr_table_overlap
 #define ap_table_elts apr_table_elts
 #define ap_is_empty_table apr_is_empty_table
-
+#define AP_OVERLAP_TABLES_SET APR_OVERLAP_TABLES_SET
 
 #define ap_send_http_header(r)
 #define ap_hard_timeout(str,r)