Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols

  for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper)
  and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE.
  All _VAR_ flavors changes to _DATA to be absolutely clear.
  Thank you Greg, for the most obvious suggestion.


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

4 files changed, 12 insertions, 12 deletions

diff --git a/strings/apr_cpystrn.c b/strings/apr_cpystrn.c
index 53433c656..5f01ea2e9 100644
--- a/strings/apr_cpystrn.c
+++ b/strings/apr_cpystrn.c
@@ -80,7 +80,7 @@
  * apr_cpystrn() follows the same call structure as strncpy().
  */
 
-APR_EXPORT(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size)
+APR_DECLARE(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size)
 {
 
     char *d, *end;
@@ -120,7 +120,7 @@ APR_EXPORT(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size)
  *                   pool and filled in with copies of the tokens
  *                   found during parsing of the arg_str. 
  */
-APR_EXPORT(apr_status_t) apr_tokenize_to_argv(const char *arg_str, 
+APR_DECLARE(apr_status_t) apr_tokenize_to_argv(const char *arg_str, 
                                             char ***argv_out,
                                             apr_pool_t *token_context)
 {
@@ -212,7 +212,7 @@ APR_EXPORT(apr_status_t) apr_tokenize_to_argv(const char *arg_str,
  * Corrected Win32 to accept "a/b\\stuff", "a:stuff"
  */
 
-APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname)
+APR_DECLARE(const char *) apr_filename_of_pathname(const char *pathname)
 {
     const char path_separator = '/';
     const char *s = strrchr(pathname, path_separator);
@@ -234,7 +234,7 @@ APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname)
  * collapse in place (src == dest) is legal.
  * returns terminating null ptr to dest string.
  */
-APR_EXPORT(char *) apr_collapse_spaces(char *dest, const char *src)
+APR_DECLARE(char *) apr_collapse_spaces(char *dest, const char *src)
 {
     while (*src) {
         if (!apr_isspace(*src)) 
diff --git a/strings/apr_fnmatch.c b/strings/apr_fnmatch.c
index 131379eca..63e8e9dce 100644
--- a/strings/apr_fnmatch.c
+++ b/strings/apr_fnmatch.c
@@ -56,7 +56,7 @@ static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
 
 static const char *rangematch(const char *, int, int);
 
-APR_EXPORT(apr_status_t) apr_fnmatch(const char *pattern, const char *string, int flags)
+APR_DECLARE(apr_status_t) apr_fnmatch(const char *pattern, const char *string, int flags)
 {
     const char *stringstart;
     char c, test;
@@ -210,7 +210,7 @@ static const char *rangematch(const char *pattern, int test, int flags)
 
 /* This function is an Apache addition */
 /* return non-zero if pattern has any glob chars in it */
-APR_EXPORT(int) apr_is_fnmatch(const char *pattern)
+APR_DECLARE(int) apr_is_fnmatch(const char *pattern)
 {
     int nesting;
 
diff --git a/strings/apr_snprintf.c b/strings/apr_snprintf.c
index 30648e7da..8b577dad3 100644
--- a/strings/apr_snprintf.c
+++ b/strings/apr_snprintf.c
@@ -653,7 +653,7 @@ static char *conv_p2_quad(u_widest_int num, register int nbits,
 /*
  * Do format conversion placing the output in buffer
  */
-APR_EXPORT(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
+APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
     apr_vformatter_buff_t *vbuff, const char *fmt, va_list ap)
 {
     register char *sp;
@@ -1155,7 +1155,7 @@ static int snprintf_flush(apr_vformatter_buff_t *vbuff)
 }
 
 
-APR_EXPORT_NONSTD(int) apr_snprintf(char *buf, size_t len, 
+APR_DECLARE_NONSTD(int) apr_snprintf(char *buf, size_t len, 
                                    const char *format, ...)
 {
     int cc;
@@ -1176,7 +1176,7 @@ APR_EXPORT_NONSTD(int) apr_snprintf(char *buf, size_t len,
 }
 
 
-APR_EXPORT(int) apr_vsnprintf(char *buf, size_t len, const char *format,
+APR_DECLARE(int) apr_vsnprintf(char *buf, size_t len, const char *format,
 			     va_list ap)
 {
     int cc;
diff --git a/strings/apr_strings.c b/strings/apr_strings.c
index f072f260d..200f18b64 100644
--- a/strings/apr_strings.c
+++ b/strings/apr_strings.c
@@ -57,7 +57,7 @@
 #include "apr_private.h"
 #include "apr_lib.h"
 
-APR_EXPORT(char *) apr_pstrdup(apr_pool_t *a, const char *s)
+APR_DECLARE(char *) apr_pstrdup(apr_pool_t *a, const char *s)
 {
     char *res;
     size_t len;
@@ -71,7 +71,7 @@ APR_EXPORT(char *) apr_pstrdup(apr_pool_t *a, const char *s)
     return res;
 }
 
-APR_EXPORT(char *) apr_pstrndup(apr_pool_t *a, const char *s, apr_size_t n)
+APR_DECLARE(char *) apr_pstrndup(apr_pool_t *a, const char *s, apr_size_t n)
 {
     char *res;
 
@@ -84,7 +84,7 @@ APR_EXPORT(char *) apr_pstrndup(apr_pool_t *a, const char *s, apr_size_t n)
     return res;
 }
 
-APR_EXPORT_NONSTD(char *) apr_pstrcat(apr_pool_t *a, ...)
+APR_DECLARE_NONSTD(char *) apr_pstrcat(apr_pool_t *a, ...)
 {
     char *cp, *argp, *res;