Author: chug
Date: Fri Jun 20 16:38:47 2014
New Revision: 1604207
URL: http://svn.apache.org/r1604207
Log:
NO-JIRA: Dodge redefinition warnings with Visual Studio 2013
Modified:
qpid/proton/trunk/proton-c/src/platform.h
qpid/proton/trunk/tests/tools/apps/c/msgr-common.h
Modified: qpid/proton/trunk/proton-c/src/platform.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/platform.h?rev=1604207&r1=1604206&r2=1604207&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/platform.h (original)
+++ qpid/proton/trunk/proton-c/src/platform.h Fri Jun 20 16:38:47 2014
@@ -85,8 +85,10 @@ int pn_i_vsnprintf(char *buf, size_t cou
#endif
#if defined _MSC_VER || defined _OPENVMS
+#if !defined(va_copy)
#define va_copy(d,s) ((d) = (s))
#endif
+#endif
#ifdef __cplusplus
}
Modified: qpid/proton/trunk/tests/tools/apps/c/msgr-common.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/tools/apps/c/msgr-common.h?rev=1604207&r1=1604206&r2=1604207&view=diff
==============================================================================
--- qpid/proton/trunk/tests/tools/apps/c/msgr-common.h (original)
+++ qpid/proton/trunk/tests/tools/apps/c/msgr-common.h Fri Jun 20 16:38:47 2014
@@ -28,9 +28,13 @@
#endif
#ifdef _MSC_VER
+#if !defined(PRIu64)
#define PRIu64 "I64u"
+#endif
+#if !defined(SCNu64)
#define SCNu64 "I64u"
#endif
+#endif
/* If still not defined, best guess */
#if !defined(SCNu64)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
