Add remaining APR_DECLARE()s to all headers. Conditionally added

  APR_DECLARES() to the sources, based on compilation emits (there
  are many that should be changed eventually, but the compiler will
  emit errors if those sources are added for win32).

  This change also splits libapr from apr, so the two projects are
  compiled seperately.  Both .dsp files must be kept up-to-date with
  source file revisions.

  Finally, libapr.def is no longer needed - so it is gone.

PR:
Obtained from:
Submitted by:
Reviewed by:


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

1 files changed, 6 insertions, 4 deletions

diff --git a/include/apr_strings.h b/include/apr_strings.h
index 46d10df02..8c87a57f4 100644
--- a/include/apr_strings.h
+++ b/include/apr_strings.h
@@ -101,8 +101,9 @@ extern "C" {
  * @return Either <0, 0, or >0.  If the first string is less than the second
  *          this returns <0, if they are equivalent it returns 0, and if the
  *          first string is greater than second string it retuns >0.
+ * @deffunc int apr_strnatcmp(char const *a, char const *b)
  */
-int apr_strnatcmp(char const *a, char const *b);
+APR_DECLARE(int) apr_strnatcmp(char const *a, char const *b);
 
 /**
  * Do a natural order comparison of two strings ignoring the case of the 
@@ -112,8 +113,9 @@ int apr_strnatcmp(char const *a, char const *b);
  * @return Either <0, 0, or >0.  If the first string is less than the second
  *         this returns <0, if they are equivalent it returns 0, and if the
  *         first string is greater than second string it retuns >0.
+ * @deffunc int apr_strnatcasecmp(char const *a, char const *b)
  */
-int apr_strnatcasecmp(char const *a, char const *b);
+APR_DECLARE(int) apr_strnatcasecmp(char const *a, char const *b);
 
 /**
  * duplicate a string into memory allocated out of a pool
@@ -203,8 +205,8 @@ APR_DECLARE(char *) apr_collapse_spaces(char *dest, const char *src);
  * @deffunc apr_status_t apr_tokenize_to_argv(const char *arg_str, char ***argv_out, apr_pool_t *token_context);
  */
 APR_DECLARE(apr_status_t) apr_tokenize_to_argv(const char *arg_str,
-                                            char ***argv_out,
-                                            apr_pool_t *token_context);
+                                               char ***argv_out,
+                                               apr_pool_t *token_context);
 
 #ifdef __cplusplus
 }