From bbbaf7e99e2c0d049293741ddf91a56cd628fc5f Mon Sep 17 00:00:00 2001
From: Andrey Volk <andywolk@gmail.com>
Date: Tue, 23 Jul 2019 12:48:31 +0400
Subject: [PATCH] FS-11931: [mod_http_cache] Fix regression, use
 SWITCH_MOD_DECLARE() in modules instead of SWITCH_DECLARE().

---
 src/mod/applications/mod_http_cache/aws.c    | 6 +++---
 src/mod/applications/mod_http_cache/aws.h    | 6 +++---
 src/mod/applications/mod_http_cache/common.c | 2 +-
 src/mod/applications/mod_http_cache/common.h | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mod/applications/mod_http_cache/aws.c b/src/mod/applications/mod_http_cache/aws.c
index e6d488ef4f..fbbbf00d98 100644
--- a/src/mod/applications/mod_http_cache/aws.c
+++ b/src/mod/applications/mod_http_cache/aws.c
@@ -107,7 +107,7 @@ static char *aws_s3_signature(char *signature, int signature_length, const char
  * @param expires seconds since the epoch
  * @return presigned_url
  */
-SWITCH_DECLARE(char *) aws_s3_presigned_url_create(const char *verb, const char *url, const char *base_domain, const char *content_type, const char *content_md5, const char *aws_access_key_id, const char *aws_secret_access_key, const char *expires)
+SWITCH_MOD_DECLARE(char *) aws_s3_presigned_url_create(const char *verb, const char *url, const char *base_domain, const char *content_type, const char *content_md5, const char *aws_access_key_id, const char *aws_secret_access_key, const char *expires)
 {
 	char signature[S3_SIGNATURE_LENGTH_MAX];
 	char signature_url_encoded[S3_SIGNATURE_LENGTH_MAX];
@@ -162,7 +162,7 @@ static char *aws_s3_authentication_create(const char *verb, const char *url, con
 	return switch_mprintf("AWS %s:%s", aws_access_key_id, signature);
 }
 
-SWITCH_DECLARE(switch_status_t) aws_s3_config_profile(switch_xml_t xml, http_profile_t *profile)
+SWITCH_MOD_DECLARE(switch_status_t) aws_s3_config_profile(switch_xml_t xml, http_profile_t *profile)
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	switch_xml_t base_domain_xml = switch_xml_child(xml, "base-domain");
@@ -217,7 +217,7 @@ SWITCH_DECLARE(switch_status_t) aws_s3_config_profile(switch_xml_t xml, http_pro
  * @param url
  * @return updated headers
  */
-SWITCH_DECLARE(switch_curl_slist_t) *aws_s3_append_headers(http_profile_t *profile, switch_curl_slist_t *headers,
+SWITCH_MOD_DECLARE(switch_curl_slist_t*) aws_s3_append_headers(http_profile_t *profile, switch_curl_slist_t *headers,
 		const char *verb, unsigned int content_length, const char *content_type, const char *url, const unsigned int block_num, char **query_string)
 {
 	char date[256];
diff --git a/src/mod/applications/mod_http_cache/aws.h b/src/mod/applications/mod_http_cache/aws.h
index 633dbc8d6f..3112bfe989 100644
--- a/src/mod/applications/mod_http_cache/aws.h
+++ b/src/mod/applications/mod_http_cache/aws.h
@@ -36,10 +36,10 @@
 /* (SHA1_LENGTH * 1.37 base64 bytes per byte * 3 url-encoded bytes per byte) */
 #define S3_SIGNATURE_LENGTH_MAX 83
 
-SWITCH_DECLARE(switch_curl_slist_t) *aws_s3_append_headers(http_profile_t *profile, switch_curl_slist_t *headers,
+SWITCH_MOD_DECLARE(switch_curl_slist_t*) aws_s3_append_headers(http_profile_t *profile, switch_curl_slist_t *headers,
 	const char *verb, unsigned int content_length, const char *content_type, const char *url, const unsigned int block_num, char **query_string);
-SWITCH_DECLARE(switch_status_t) aws_s3_config_profile(switch_xml_t xml, http_profile_t *profile);
-SWITCH_DECLARE(char *) aws_s3_presigned_url_create(const char *verb, const char *url, const char *base_domain, const char *content_type, const char *content_md5, const char *aws_access_key_id, const char *aws_secret_access_key, const char *expires);
+SWITCH_MOD_DECLARE(switch_status_t) aws_s3_config_profile(switch_xml_t xml, http_profile_t *profile);
+SWITCH_MOD_DECLARE(char *) aws_s3_presigned_url_create(const char *verb, const char *url, const char *base_domain, const char *content_type, const char *content_md5, const char *aws_access_key_id, const char *aws_secret_access_key, const char *expires);
 
 #endif
 
diff --git a/src/mod/applications/mod_http_cache/common.c b/src/mod/applications/mod_http_cache/common.c
index 13c43156d7..5db61fcdf9 100644
--- a/src/mod/applications/mod_http_cache/common.c
+++ b/src/mod/applications/mod_http_cache/common.c
@@ -63,7 +63,7 @@ static char *my_strrstr(const char *haystack, const char *needle)
 	return NULL;
 }
 
-SWITCH_DECLARE(void) parse_url(char *url, const char *base_domain, const char *default_base_domain, char **bucket, char **object)
+SWITCH_MOD_DECLARE(void) parse_url(char *url, const char *base_domain, const char *default_base_domain, char **bucket, char **object)
 {
 	char *bucket_start = NULL;
 	char *bucket_end;
diff --git a/src/mod/applications/mod_http_cache/common.h b/src/mod/applications/mod_http_cache/common.h
index 278af9b9d6..612b7fb2ad 100644
--- a/src/mod/applications/mod_http_cache/common.h
+++ b/src/mod/applications/mod_http_cache/common.h
@@ -23,7 +23,7 @@ struct http_profile {
 typedef struct http_profile http_profile_t;
 
 
-SWITCH_DECLARE(void) parse_url(char *url, const char *base_domain, const char *default_base_domain, char **bucket, char **object);
+SWITCH_MOD_DECLARE(void) parse_url(char *url, const char *base_domain, const char *default_base_domain, char **bucket, char **object);
 
 #endif