Author: wrowe Date: Wed Jan 5 12:17:27 2005 New Revision: 124266 URL: http://svn.apache.org/viewcvs?view=rev&rev=124266 Log:
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>. Modified: apr/apr-iconv/trunk/include/apr_iconv.h Modified: apr/apr-iconv/trunk/include/apr_iconv.h Url: http://svn.apache.org/viewcvs/apr/apr-iconv/trunk/include/apr_iconv.h?view=diff&rev=124266&p1=apr/apr-iconv/trunk/include/apr_iconv.h&r1=124265&p2=apr/apr-iconv/trunk/include/apr_iconv.h&r2=124266 ============================================================================== --- apr/apr-iconv/trunk/include/apr_iconv.h (original) +++ apr/apr-iconv/trunk/include/apr_iconv.h Wed Jan 5 12:17:27 2005 @@ -49,7 +49,7 @@ * and calling conventions at compile time. */ -#if !defined(WIN32) +#if defined(DOXYGEN) || !defined(WIN32) /** * The public apr-iconv functions are declared with API_DECLARE(), so they * use the most portable calling convention. Public apr-iconv functions @@ -76,15 +76,15 @@ #define API_DECLARE_DATA #elif defined(API_DECLARE_STATIC) #define API_DECLARE(type) type __stdcall -#define API_DECLARE_NONSTD(type) type +#define API_DECLARE_NONSTD(type) type __cdecl #define API_DECLARE_DATA #elif defined(API_DECLARE_EXPORT) #define API_DECLARE(type) __declspec(dllexport) type __stdcall -#define API_DECLARE_NONSTD(type) __declspec(dllexport) type +#define API_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl #define API_DECLARE_DATA __declspec(dllexport) #else #define API_DECLARE(type) __declspec(dllimport) type __stdcall -#define API_DECLARE_NONSTD(type) __declspec(dllimport) type +#define API_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl #define API_DECLARE_DATA __declspec(dllimport) #endif
