Introduce apr_table_do_callback_fn_t as a prototype declaration, and

  consistify all broken APR_DECLARE() prototypes that were, in fact, always
  handled as APR_DECLARE_NONSTD() by the MSVC compiler.  Unfortunately, no
  emit is raised when the compiler ignores our APR_DECLARE() semantic.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63527 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 4 deletions

diff --git a/tables/apr_tables.c b/tables/apr_tables.c
index 9ed11d9c8..b143deb3a 100644
--- a/tables/apr_tables.c
+++ b/tables/apr_tables.c
@@ -695,16 +695,17 @@ APR_DECLARE(apr_table_t *) apr_table_overlay(apr_pool_t *p,
  *
  * So to make mod_file_cache easier to maintain, it's a good thing
  */
-APR_DECLARE(void) apr_table_do(int (*comp) (void *, const char *, const char *),
-			      void *rec, const apr_table_t *t, ...)
+APR_DECLARE_NONSTD(void) apr_table_do(apr_table_do_callback_fn_t *comp,
+                                      void *rec, const apr_table_t *t, ...)
 {
     va_list vp;
     va_start(vp, t);
     apr_table_vdo(comp, rec, t, vp);
     va_end(vp);  
 } 
-APR_DECLARE(void) apr_table_vdo(int (*comp) (void *, const char *, const char *),
-				void *rec, const apr_table_t *t, va_list vp)
+
+APR_DECLARE(void) apr_table_vdo(apr_table_do_callback_fn_t *comp,
+                                void *rec, const apr_table_t *t, va_list vp)
 {
     char *argp;
     apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;