Guess at fixing win32 build regression on trunk introduced by r1734656

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829381 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 4706d833a058f43e6ab2863d2109494eba790eb1..b8ed6f25adac2404eb6a5fd56f913f79aeed054b 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -571,14 +571,15 @@
  * 20171014.7 (2.5.1-dev)  Add AP_CORE_DEFAULT macro
  * 20171014.8 (2.5.1-dev)  Add CONN_STATE_NUM to enum conn_state_e
  * 20171014.9 (2.5.1-dev)  Add response_field_size to proxy_worker_shared 
+ * 20180417.1 (2.5.1-dev)  Toggle ap_filter_input|output_pending API to _NONSTD
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20171014
+#define MODULE_MAGIC_NUMBER_MAJOR 20180417
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 9                 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1                 /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

diff --git a/include/util_filter.h b/include/util_filter.h
index 814c6325ec8dfb0fd4b2c3c0d77d370e41a10e54..4ed5fe8b591854cf5b1a6c8f996a5c5dc9148f6b 100644 (file)
--- a/include/util_filter.h
+++ b/include/util_filter.h
@@ -626,7 +626,7 @@ AP_DECLARE(int) ap_filter_should_yield(ap_filter_t *f);
  * If some unwritten data remains, this function returns OK. If any
  * attempt to write data failed, this functions returns a positive integer.
  */
-AP_DECLARE(int) ap_filter_output_pending(conn_rec *c);
+AP_DECLARE_NONSTD(int) ap_filter_output_pending(conn_rec *c);
 
 /**
  * This function determines whether there is pending data in the input
@@ -637,7 +637,7 @@ AP_DECLARE(int) ap_filter_output_pending(conn_rec *c);
  * @return If no pending data remains, this function returns DECLINED.
  * If some pending data remains, this function returns OK.
  */
-AP_DECLARE(int) ap_filter_input_pending(conn_rec *c);
+AP_DECLARE_NONSTD(int) ap_filter_input_pending(conn_rec *c);
 
 /**
  * Flush function for apr_brigade_* calls.  This calls ap_pass_brigade

diff --git a/server/util_filter.c b/server/util_filter.c
index 716251e91004fedc73f70cbfbe243bf2914360c9..7b32a2d40e43553cb571e539782aa0023ec0b0e8 100644 (file)
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -965,7 +965,7 @@ AP_DECLARE(int) ap_filter_should_yield(ap_filter_t *f)
     return 0;
 }
 
-AP_DECLARE(int) ap_filter_output_pending(conn_rec *c)
+AP_DECLARE_NONSTD(int) ap_filter_output_pending(conn_rec *c)
 {
     apr_hash_index_t *rindex;
     int data_in_output_filters = DECLINED;
@@ -999,7 +999,7 @@ AP_DECLARE(int) ap_filter_output_pending(conn_rec *c)
     return data_in_output_filters;
 }
 
-AP_DECLARE(int) ap_filter_input_pending(conn_rec *c)
+AP_DECLARE_NONSTD(int) ap_filter_input_pending(conn_rec *c)
 {
     apr_hash_index_t *rindex;