You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2005/01/05 21:07:11 UTC
svn commit: r124262 - /apr/apr/trunk/include/apr.hw
Author: wrowe
Date: Wed Jan 5 12:07:09 2005
New Revision: 124262
URL: http://svn.apache.org/viewcvs?view=rev&rev=124262
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/trunk/include/apr.hw
Modified: apr/apr/trunk/include/apr.hw
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/include/apr.hw?view=diff&rev=124262&p1=apr/apr/trunk/include/apr.hw&r1=124261&p2=apr/apr/trunk/include/apr.hw&r2=124262
==============================================================================
--- apr/apr/trunk/include/apr.hw (original)
+++ apr/apr/trunk/include/apr.hw Wed Jan 5 12:07:09 2005
@@ -432,15 +432,15 @@
#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