diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 16:55:11 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 16:55:11 +0000 |
| commit | fc44f8a893521c0f8eb43af8f5783e69ebfe19b1 (patch) | |
| tree | 56dd448c11f77c53a545e0027a8c7ed8814351ec /time/win32/timestr.c | |
| parent | 1760f5378838f561bf8f382293714c9760efb183 (diff) | |
| download | libapr-fc44f8a893521c0f8eb43af8f5783e69ebfe19b1.tar.gz | |
merge trunk revs 1083169, 1083177, 1083178, 1083183, and 1083227
to resolve some gcc warnings and dead code on Windows
(the testlfsabi change from r1083183 is omitted, as the testcases
aren't in this branch)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1083869 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'time/win32/timestr.c')
| -rw-r--r-- | time/win32/timestr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/time/win32/timestr.c b/time/win32/timestr.c index 116924991..fc9130bc6 100644 --- a/time/win32/timestr.c +++ b/time/win32/timestr.c @@ -120,8 +120,8 @@ APR_DECLARE(apr_status_t) apr_ctime(char *date_str, apr_time_t t) #ifndef _WIN32_WCE -apr_size_t win32_strftime_extra(char *s, size_t max, const char *format, - const struct tm *tm) +static apr_size_t win32_strftime_extra(char *s, size_t max, const char *format, + const struct tm *tm) { /* If the new format string is bigger than max, the result string won't fit * anyway. If format strings are added, made sure the padding below is |