apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r421810 - in /apr/apr/trunk/include/arch/win32: apr_arch_atime.h apr_arch_misc.h
Date Fri, 14 Jul 2006 05:32:59 GMT
Author: jerenkrantz
Date: Thu Jul 13 22:32:58 2006
New Revision: 421810

URL: http://svn.apache.org/viewvc?rev=421810&view=rev
Log:
Fix up Win32 private headers to use APR_INLINE consistently; use static inline
declarations for those appearing in the header file.

Originally titled: [patch 13/17] APR_INLINE

Submitted by: John Vandenberg
Reviewed by: Justin Erenkrantz

Modified:
    apr/apr/trunk/include/arch/win32/apr_arch_atime.h
    apr/apr/trunk/include/arch/win32/apr_arch_misc.h

Modified: apr/apr/trunk/include/arch/win32/apr_arch_atime.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_arch_atime.h?rev=421810&r1=421809&r2=421810&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_arch_atime.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_arch_atime.h Thu Jul 13 22:32:58 2006
@@ -36,7 +36,7 @@
 #define APR_DELTA_EPOCH_IN_USEC   APR_TIME_C(11644473600000000);
 
 
-__inline void FileTimeToAprTime(apr_time_t *result, FILETIME *input)
+static APR_INLINE void FileTimeToAprTime(apr_time_t *result, FILETIME *input)
 {
     /* Convert FILETIME one 64 bit number so we can work with it. */
     *result = input->dwHighDateTime;
@@ -48,7 +48,7 @@
 }
 
 
-__inline void AprTimeToFileTime(LPFILETIME pft, apr_time_t t)
+static APR_INLINE void AprTimeToFileTime(LPFILETIME pft, apr_time_t t)
 {
     LONGLONG ll;
     t += APR_DELTA_EPOCH_IN_USEC;

Modified: apr/apr/trunk/include/arch/win32/apr_arch_misc.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_arch_misc.h?rev=421810&r1=421809&r2=421810&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_arch_misc.h Thu Jul 13 22:32:58 2006
@@ -141,28 +141,28 @@
 #if defined(_MSC_VER)
 #include "crtdbg.h"
 
-APR_INLINE void* apr_malloc_dbg(size_t size, const char* filename,
-                                int linenumber)
+static APR_INLINE void* apr_malloc_dbg(size_t size, const char* filename,
+                                       int linenumber)
 {
     return _malloc_dbg(size, _CRT_BLOCK, filename, linenumber);
 }
 
-APR_INLINE void* apr_realloc_dbg(void* userData, size_t newSize,
-                                 const char* filename, int linenumber)
+static APR_INLINE void* apr_realloc_dbg(void* userData, size_t newSize,
+                                        const char* filename, int linenumber)
 {
     return _realloc_dbg(userData, newSize, _CRT_BLOCK, filename, linenumber);
 }
 
 #else
 
-APR_INLINE void* apr_malloc_dbg(size_t size, const char* filename,
-                                int linenumber)
+static APR_INLINE void* apr_malloc_dbg(size_t size, const char* filename,
+                                       int linenumber)
 {
     return malloc(size);
 }
 
-APR_INLINE void* apr_realloc_dbg(void* userData, size_t newSize,
-                                 const char* filename, int linenumber)
+static APR_INLINE void* apr_realloc_dbg(void* userData, size_t newSize,
+                                        const char* filename, int linenumber)
 {
     return realloc(userData, newSize);
 }
@@ -186,7 +186,7 @@
 #define APR_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \
     typedef rettype (calltype *apr_winapi_fpt_##fn) args; \
     static apr_winapi_fpt_##fn apr_winapi_pfn_##fn = NULL; \
-    __inline rettype apr_winapi_##fn args \
+    static APR_INLINE rettype apr_winapi_##fn args \
     {   if (!apr_winapi_pfn_##fn) \
             apr_winapi_pfn_##fn = (apr_winapi_fpt_##fn) \
                                       apr_load_dll_func(lib, #fn, ord); \



Mime
View raw message