svn commit: r1920660 - in /apr/apr-util/branches/1.7.x: jose/apr_jose_encode.c json/apr_json_decode.c json/apr_json_encode.c

Author: ivan
Date: Sat Sep 14 21:17:34 2024
New Revision: 1920660

URL: http://svn.apache.org/viewvc?rev=1920660&view=rev
Log:
Fix x86 Windows build: add APU_DECLARE() apr_jose*() and apr_json_*()
function implementation.

Modified:
    apr/apr-util/branches/1.7.x/jose/apr_jose_encode.c
    apr/apr-util/branches/1.7.x/json/apr_json_decode.c
    apr/apr-util/branches/1.7.x/json/apr_json_encode.c

Modified: apr/apr-util/branches/1.7.x/jose/apr_jose_encode.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/jose/apr_jose_encode.c?rev=1920660&r1=1920659&r2=1920660&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/jose/apr_jose_encode.c (original)
+++ apr/apr-util/branches/1.7.x/jose/apr_jose_encode.c Sat Sep 14 21:17:34 2024
@@ -671,7 +671,7 @@ static apr_status_t apr_jose_encode_json
     return status;
 }
 
-apr_status_t apr_jose_encode(apr_bucket_brigade *brigade,
+APU_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)
 {

Modified: apr/apr-util/branches/1.7.x/json/apr_json_decode.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/json/apr_json_decode.c?rev=1920660&r1=1920659&r2=1920660&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/json/apr_json_decode.c (original)
+++ apr/apr-util/branches/1.7.x/json/apr_json_decode.c Sat Sep 14 21:17:34 2024
@@ -777,7 +777,7 @@ static apr_status_t apr_json_decode_valu
     return status;
 }
 
-apr_status_t apr_json_decode(apr_json_value_t ** retval, const char *injson,
+APU_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)
 {
@@ -807,7 +807,7 @@ apr_status_t apr_json_decode(apr_json_va
 
 #else
 /* we do not yet support JSON on EBCDIC platforms, but will do in future */
-apr_status_t apr_json_decode(apr_json_value_t ** retval, const char *injson,
+APU_DECLARE(apr_status_t) apr_json_decode(apr_json_value_t ** retval, const char *injson,
         apr_size_t injson_size, apr_pool_t * pool)
 {
     return APR_ENOTIMPL;

Modified: apr/apr-util/branches/1.7.x/json/apr_json_encode.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/json/apr_json_encode.c?rev=1920660&r1=1920659&r2=1920660&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/json/apr_json_encode.c (original)
+++ apr/apr-util/branches/1.7.x/json/apr_json_encode.c Sat Sep 14 21:17:34 2024
@@ -290,7 +290,7 @@ static apr_status_t apr_json_encode_valu
     return status;
 }
 
-apr_status_t apr_json_encode(apr_bucket_brigade * brigade, apr_brigade_flush flush,
+APU_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};
@@ -299,7 +299,7 @@ apr_status_t apr_json_encode(apr_bucket_
 
 #else
  /* we do not yet support JSON on EBCDIC platforms, but will do in future */
-apr_status_t apr_json_encode(apr_bucket_brigade * brigade, apr_brigade_flush flush,
+APU_DECLARE(apr_status_t) apr_json_encode(apr_bucket_brigade * brigade, apr_brigade_flush flush,
                 void *ctx, const apr_json_value_t * json, apr_pool_t * pool)
 {
     return APR_ENOTIMPL;