Fix x86 Windows build: add APU_DECLARE() apr_jose*() and apr_json_*()

Ivan Zhakov · Ivan Zhakov · commit 322f45c29247 · 2024-09-14T21:17:34.000Z
function implementation. git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.7.x@1920660 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jose/apr_jose_encode.c b/jose/apr_jose_encode.c
@@ -671,7 +671,7 @@ 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,
+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)
 {
diff --git a/json/apr_json_decode.c b/json/apr_json_decode.c
@@ -777,7 +777,7 @@ 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,
+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_value_t ** retval, const char *injson,
 
 #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;
diff --git a/json/apr_json_encode.c b/json/apr_json_encode.c
@@ -290,7 +290,7 @@ 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,
+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_brigade * brigade, apr_brigade_flush flu
 
 #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;

Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,7 @@ static apr_status_t apr_jose_encode_json_jws(apr_bucket_brigade *brigade,`
`671`	`671`	`return status;`
`672`	`672`	`}`
`673`	`673`
`674`		`-apr_status_t apr_jose_encode(apr_bucket_brigade *brigade,`
	`674`	`+APU_DECLARE(apr_status_t) apr_jose_encode(apr_bucket_brigade *brigade,`
`675`	`675`	`apr_brigade_flush flush, void ctx, apr_jose_t jose, apr_jose_cb_t *cb,`
`676`	`676`	`apr_pool_t *pool)`
`677`	`677`	`{`
Original file line number	Diff line number	Diff line change
`@@ -777,7 +777,7 @@ static apr_status_t apr_json_decode_value(apr_json_scanner_t * self, apr_json_va`
`777`	`777`	`return status;`
`778`	`778`	`}`
`779`	`779`
`780`		`-apr_status_t apr_json_decode(apr_json_value_t ** retval, const char *injson,`
	`780`	`+APU_DECLARE(apr_status_t) apr_json_decode(apr_json_value_t ** retval, const char *injson,`
`781`	`781`	`apr_ssize_t injson_size, apr_off_t * offset, int flags, int level,`
`782`	`782`	`apr_pool_t * pool)`
`783`	`783`	`{`
`@@ -807,7 +807,7 @@ apr_status_t apr_json_decode(apr_json_value_t ** retval, const char *injson,`
`807`	`807`
`808`	`808`	`#else`
`809`	`809`	`/* we do not yet support JSON on EBCDIC platforms, but will do in future */`
`810`		`-apr_status_t apr_json_decode(apr_json_value_t ** retval, const char *injson,`
	`810`	`+APU_DECLARE(apr_status_t) apr_json_decode(apr_json_value_t ** retval, const char *injson,`
`811`	`811`	`apr_size_t injson_size, apr_pool_t * pool)`
`812`	`812`	`{`
`813`	`813`	`return APR_ENOTIMPL;`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ static apr_status_t apr_json_encode_value(apr_json_serializer_t * self, const ap`
`290`	`290`	`return status;`
`291`	`291`	`}`
`292`	`292`
`293`		`-apr_status_t apr_json_encode(apr_bucket_brigade * brigade, apr_brigade_flush flush,`
	`293`	`+APU_DECLARE(apr_status_t) apr_json_encode(apr_bucket_brigade * brigade, apr_brigade_flush flush,`
`294`	`294`	`void ctx, const apr_json_value_t json, int flags, apr_pool_t * pool)`
`295`	`295`	`{`
`296`	`296`	`apr_json_serializer_t serializer = {pool, brigade, flush, ctx, flags};`
`@@ -299,7 +299,7 @@ apr_status_t apr_json_encode(apr_bucket_brigade * brigade, apr_brigade_flush flu`
`299`	`299`
`300`	`300`	`#else`
`301`	`301`	`/* we do not yet support JSON on EBCDIC platforms, but will do in future */`
`302`		`-apr_status_t apr_json_encode(apr_bucket_brigade * brigade, apr_brigade_flush flush,`
	`302`	`+APU_DECLARE(apr_status_t) apr_json_encode(apr_bucket_brigade * brigade, apr_brigade_flush flush,`
`303`	`303`	`void ctx, const apr_json_value_t json, apr_pool_t * pool)`
`304`	`304`	`{`
`305`	`305`	`return APR_ENOTIMPL;`