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: https://svn.apache.org/repos/asf/apr/apr/trunk@61072 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 4 deletions

diff --git a/time/win32/timestr.c b/time/win32/timestr.c
index 69db6fcd3..9c7cfc106 100644
--- a/time/win32/timestr.c
+++ b/time/win32/timestr.c
@@ -64,7 +64,7 @@ APR_DECLARE_DATA const char apr_day_snames[7][4] =
     "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 };
 
-apr_status_t apr_rfc822_date(char *date_str, apr_time_t t)
+APR_DECLARE(apr_status_t) apr_rfc822_date(char *date_str, apr_time_t t)
 {
     apr_exploded_time_t xt;
     const char *s;
@@ -112,7 +112,7 @@ apr_status_t apr_rfc822_date(char *date_str, apr_time_t t)
     return APR_SUCCESS;
 }
 
-apr_status_t apr_ctime(char *date_str, apr_time_t t)
+APR_DECLARE(apr_status_t) apr_ctime(char *date_str, apr_time_t t)
 {
     apr_exploded_time_t xt;
     const char *s;
@@ -154,8 +154,9 @@ apr_status_t apr_ctime(char *date_str, apr_time_t t)
     return APR_SUCCESS;
 }
 
-apr_status_t apr_strftime(char *s, apr_size_t *retsize, apr_size_t max, 
-                        const char *format, apr_exploded_time_t *xt)
+APR_DECLARE(apr_status_t) apr_strftime(char *s, apr_size_t *retsize,
+                                       apr_size_t max, const char *format,
+                                       apr_exploded_time_t *xt)
 {
     struct tm tm;
     memset(&tm, 0, sizeof tm);