diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2005-01-05 20:07:09 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2005-01-05 20:07:09 +0000 |
| commit | b4c4511b67b9563ad763bb58f9b11593d85b9f7c (patch) | |
| tree | 1ef3efba6609f552aa5d82b5012c1d1fa872c978 | |
| parent | 0361444201c6ec24a52b7794a8650fa84972030b (diff) | |
| download | libapr-b4c4511b67b9563ad763bb58f9b11593d85b9f7c.tar.gz | |
Begin explicit __cdecl protection against including the apr headers from any
c sources compiled /Gz (default __stdcall convention). Observed and suggested
by Andre Pang <ozone algorithm.com.au>.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@124262 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/apr.hw | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/apr.hw b/include/apr.hw index 7797ed97d..cc26f3aa8 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -432,15 +432,15 @@ typedef int gid_t; #elif defined(APR_DECLARE_STATIC) #define APR_DECLARE(type) type __stdcall -#define APR_DECLARE_NONSTD(type) type +#define APR_DECLARE_NONSTD(type) type __cdecl #define APR_DECLARE_DATA #elif defined(APR_DECLARE_EXPORT) #define APR_DECLARE(type) __declspec(dllexport) type __stdcall -#define APR_DECLARE_NONSTD(type) __declspec(dllexport) type +#define APR_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl #define APR_DECLARE_DATA __declspec(dllexport) #else #define APR_DECLARE(type) __declspec(dllimport) type __stdcall -#define APR_DECLARE_NONSTD(type) __declspec(dllimport) type +#define APR_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl #define APR_DECLARE_DATA __declspec(dllimport) #endif |