Add APR_DECLARE() to apr_json_*() and apr_jose_*() functions declaration to

fix 32-bit Windows build.

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

5 files changed, 49 insertions, 36 deletions

diff --git a/jose/apr_jose_decode.c b/jose/apr_jose_decode.c
index 41dfc2e28..24017c824 100644
--- a/jose/apr_jose_decode.c
+++ b/jose/apr_jose_decode.c
@@ -1681,9 +1681,10 @@ apr_status_t apr_jose_decode_json(apr_jose_t **jose, const char *typ,
     return status;
 }
 
-apr_status_t apr_jose_decode(apr_jose_t **jose, const char *typ,
-        apr_bucket_brigade *brigade, apr_jose_cb_t *cb, int level, int flags,
-        apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_jose_decode(apr_jose_t **jose, const char *typ,
+                                          apr_bucket_brigade *brigade,
+                                          apr_jose_cb_t *cb, int level,
+                                          int flags, apr_pool_t *pool)
 {
 
     /* handle JOSE and JOSE+JSON */
diff --git a/jose/apr_jose_encode.c b/jose/apr_jose_encode.c
index 220c6f2b8..f729bdba3 100644
--- a/jose/apr_jose_encode.c
+++ b/jose/apr_jose_encode.c
@@ -671,9 +671,10 @@ static apr_status_t apr_jose_encode_json_jws(apr_bucket_brigade *brigade,
     return status;
 }
 
-apr_status_t apr_jose_encode(apr_bucket_brigade *brigade,
-        apr_brigade_flush flush, void *ctx, apr_jose_t *jose, apr_jose_cb_t *cb,
-        apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_jose_encode(apr_bucket_brigade *brigade,
+                                          apr_brigade_flush flush, void *ctx,
+                                          apr_jose_t *jose, apr_jose_cb_t *cb,
+                                          apr_pool_t *pool)
 {
     apr_pool_t *p;
     apr_status_t status = APR_EINVAL;
diff --git a/json/apr_json.c b/json/apr_json.c
index 67dfadb76..6a57fe27f 100644
--- a/json/apr_json.c
+++ b/json/apr_json.c
@@ -31,12 +31,12 @@
         APR_RING_CHECK_CONSISTENCY(&(o)->list, apr_json_value_t, link);                             \
     } while (0)
 
-apr_json_value_t *apr_json_value_create(apr_pool_t *pool)
+APR_DECLARE(apr_json_value_t *) apr_json_value_create(apr_pool_t *pool)
 {
     return apr_pcalloc(pool, sizeof(apr_json_value_t));
 }
 
-apr_json_value_t *apr_json_object_create(apr_pool_t *pool)
+APR_DECLARE(apr_json_value_t *) apr_json_object_create(apr_pool_t *pool)
 {
     apr_json_object_t *object;
 
@@ -50,8 +50,10 @@ apr_json_value_t *apr_json_object_create(apr_pool_t *pool)
     return json;
 }
 
-apr_json_value_t *apr_json_string_create(apr_pool_t *pool, const char *val,
-        apr_ssize_t len) {
+APR_DECLARE(apr_json_value_t *) apr_json_string_create(apr_pool_t *pool,
+                                                       const char *val,
+                                                       apr_ssize_t len)
+{
     apr_json_value_t *json = apr_json_value_create(pool);
 
     if (json) {
@@ -67,7 +69,7 @@ apr_json_value_t *apr_json_string_create(apr_pool_t *pool, const char *val,
     return json;
 }
 
-apr_json_value_t *apr_json_array_create(apr_pool_t *pool, int nelts)
+APR_DECLARE(apr_json_value_t *) apr_json_array_create(apr_pool_t *pool, int nelts)
 {
     apr_json_value_t *json = apr_json_value_create(pool);
 
@@ -82,7 +84,7 @@ apr_json_value_t *apr_json_array_create(apr_pool_t *pool, int nelts)
     return json;
 }
 
-apr_json_value_t *apr_json_long_create(apr_pool_t *pool, apr_int64_t lnumber)
+APR_DECLARE(apr_json_value_t *) apr_json_long_create(apr_pool_t *pool, apr_int64_t lnumber)
 {
     apr_json_value_t *json = apr_json_value_create(pool);
 
@@ -94,7 +96,7 @@ apr_json_value_t *apr_json_long_create(apr_pool_t *pool, apr_int64_t lnumber)
     return json;
 }
 
-apr_json_value_t *apr_json_double_create(apr_pool_t *pool, double dnumber)
+APR_DECLARE(apr_json_value_t *) apr_json_double_create(apr_pool_t *pool, double dnumber)
 {
     apr_json_value_t *json = apr_json_value_create(pool);
 
@@ -106,7 +108,7 @@ apr_json_value_t *apr_json_double_create(apr_pool_t *pool, double dnumber)
     return json;
 }
 
-apr_json_value_t *apr_json_boolean_create(apr_pool_t *pool, int boolean)
+APR_DECLARE(apr_json_value_t *) apr_json_boolean_create(apr_pool_t *pool, int boolean)
 {
     apr_json_value_t *json = apr_json_value_create(pool);
 
@@ -118,7 +120,7 @@ apr_json_value_t *apr_json_boolean_create(apr_pool_t *pool, int boolean)
     return json;
 }
 
-apr_json_value_t *apr_json_null_create(apr_pool_t *pool)
+APR_DECLARE(apr_json_value_t *) apr_json_null_create(apr_pool_t *pool)
 {
     apr_json_value_t *json = apr_json_value_create(pool);
 
@@ -129,7 +131,7 @@ apr_json_value_t *apr_json_null_create(apr_pool_t *pool)
     return json;
 }
 
-apr_status_t apr_json_object_set(apr_json_value_t *object,
+APR_DECLARE(apr_status_t) apr_json_object_set(apr_json_value_t *object,
         const char *key, apr_ssize_t klen, apr_json_value_t *val,
         apr_pool_t *pool)
 {
@@ -170,9 +172,10 @@ apr_status_t apr_json_object_set(apr_json_value_t *object,
     return APR_SUCCESS;
 }
 
-apr_status_t apr_json_object_set_ex(apr_json_value_t *object,
-        apr_json_value_t *key, apr_json_value_t *val,
-        apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_json_object_set_ex(apr_json_value_t *object,
+                                                 apr_json_value_t *key,
+                                                 apr_json_value_t *val,
+                                                 apr_pool_t *pool)
 {
     apr_json_kv_t *kv;
     apr_hash_t *hash;
@@ -209,7 +212,9 @@ apr_status_t apr_json_object_set_ex(apr_json_value_t *object,
     return APR_SUCCESS;
 }
 
-apr_json_kv_t *apr_json_object_get(apr_json_value_t *object, const char *key, apr_ssize_t klen)
+APR_DECLARE(apr_json_kv_t *) apr_json_object_get(apr_json_value_t *object,
+                                                 const char *key,
+                                                 apr_ssize_t klen)
 {
     if (object->type != APR_JSON_OBJECT) {
         return NULL;
@@ -218,7 +223,7 @@ apr_json_kv_t *apr_json_object_get(apr_json_value_t *object, const char *key, ap
     return apr_hash_get(object->value.object->hash, key, klen);
 }
 
-apr_json_kv_t *apr_json_object_first(apr_json_value_t *obj)
+APR_DECLARE(apr_json_kv_t *) apr_json_object_first(apr_json_value_t *obj)
 {
     apr_json_kv_t *kv;
 
@@ -236,7 +241,8 @@ apr_json_kv_t *apr_json_object_first(apr_json_value_t *obj)
     }
 }
 
-apr_json_kv_t *apr_json_object_next(apr_json_value_t *obj, apr_json_kv_t *kv)
+APR_DECLARE(apr_json_kv_t *) apr_json_object_next(apr_json_value_t *obj,
+                                                  apr_json_kv_t *kv)
 {
     apr_json_kv_t *next;
 
@@ -254,8 +260,8 @@ apr_json_kv_t *apr_json_object_next(apr_json_value_t *obj, apr_json_kv_t *kv)
     }
 }
 
-apr_status_t apr_json_array_add(apr_json_value_t *arr,
-        apr_json_value_t *val)
+APR_DECLARE(apr_status_t) apr_json_array_add(apr_json_value_t *arr,
+                                             apr_json_value_t *val)
 {
     apr_array_header_t *array;
 
@@ -274,7 +280,8 @@ apr_status_t apr_json_array_add(apr_json_value_t *arr,
     return APR_SUCCESS;
 }
 
-apr_json_value_t *apr_json_array_get(apr_json_value_t *arr, int index)
+APR_DECLARE(apr_json_value_t *) apr_json_array_get(apr_json_value_t *arr,
+                                                   int index)
 {
     if (arr->type != APR_JSON_ARRAY) {
         return NULL;
@@ -283,7 +290,7 @@ apr_json_value_t *apr_json_array_get(apr_json_value_t *arr, int index)
     return APR_ARRAY_IDX(arr->value.array->array, index, apr_json_value_t *);
 }
 
-apr_json_value_t *apr_json_array_first(const apr_json_value_t *arr)
+APR_DECLARE(apr_json_value_t *) apr_json_array_first(const apr_json_value_t *arr)
 {
     apr_json_value_t *val;
 
@@ -302,8 +309,8 @@ apr_json_value_t *apr_json_array_first(const apr_json_value_t *arr)
     }
 }
 
-apr_json_value_t *apr_json_array_next(const apr_json_value_t *arr,
-        const apr_json_value_t *val)
+APR_DECLARE(apr_json_value_t *) apr_json_array_next(const apr_json_value_t *arr,
+                                                    const apr_json_value_t *val)
 {
     apr_json_value_t *next;
 
@@ -322,9 +329,10 @@ apr_json_value_t *apr_json_array_next(const apr_json_value_t *arr,
     }
 }
 
-apr_json_value_t *apr_json_overlay(apr_pool_t *p,
-        apr_json_value_t *overlay, apr_json_value_t *base,
-        int flags)
+APR_DECLARE(apr_json_value_t *) apr_json_overlay(apr_pool_t *p,
+                                                 apr_json_value_t *overlay,
+                                                 apr_json_value_t *base,
+                                                 int flags)
 {
     apr_json_value_t *res;
     apr_json_kv_t *kv;
diff --git a/json/apr_json_decode.c b/json/apr_json_decode.c
index 5ef2cb854..9fdb5ff11 100644
--- a/json/apr_json_decode.c
+++ b/json/apr_json_decode.c
@@ -777,9 +777,10 @@ static apr_status_t apr_json_decode_value(apr_json_scanner_t * self, apr_json_va
     return status;
 }
 
-apr_status_t apr_json_decode(apr_json_value_t ** retval, const char *injson,
-        apr_ssize_t injson_size, apr_off_t * offset, int flags, int level,
-        apr_pool_t * pool)
+APR_DECLARE(apr_status_t) apr_json_decode(apr_json_value_t ** retval,
+                                          const char *injson,
+                                          apr_ssize_t injson_size, apr_off_t * offset,
+                                          int flags, int level, apr_pool_t * pool)
 {
     apr_status_t status;
     apr_json_scanner_t scanner;
diff --git a/json/apr_json_encode.c b/json/apr_json_encode.c
index 13b1e67a8..cd5a7f497 100644
--- a/json/apr_json_encode.c
+++ b/json/apr_json_encode.c
@@ -290,8 +290,10 @@ static apr_status_t apr_json_encode_value(apr_json_serializer_t * self, const ap
     return status;
 }
 
-apr_status_t apr_json_encode(apr_bucket_brigade * brigade, apr_brigade_flush flush,
-                void *ctx, const apr_json_value_t * json, int flags, apr_pool_t * pool)
+APR_DECLARE(apr_status_t) apr_json_encode(apr_bucket_brigade * brigade,
+                                          apr_brigade_flush flush,
+                                          void *ctx, const apr_json_value_t * json,
+                                          int flags, apr_pool_t * pool)
 {
     apr_json_serializer_t serializer = {pool, brigade, flush, ctx, flags};
     return apr_json_encode_value(&serializer, json);