va_copy macro renamed to VA_COPY

diff --git a/lib/defines.h b/lib/defines.h
index 42d68e2016ec0bc6723f14674f0659ef8fd77459..73e2d54fcdffa3c5a582415ddbbabc80fd64ebec 100644 (file)
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -111,7 +111,9 @@
 
 #ifdef USE_VA_COPY
 # ifndef HAVE_VA_COPY
-# define va_copy(x,y) __va_copy(x,y)
+# define VA_COPY __va_copy
+# else
+# define VA_COPY va_copy
 # endif
 #endif
 

diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index a5c94de94deec42656422029119151b34cf3b92c..bfe24640c3735a2478d8049dfc0e11bdc254208e 100644 (file)
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -45,7 +45,7 @@ int gnutls_set_cipher_priority( GNUTLS_STATE state, GNUTLS_LIST) {
        va_start( ap, state);
 
 #ifdef USE_VA_COPY
-       va_copy( _ap, ap);
+       VA_COPY( _ap, ap);
 #else
        _ap = ap;
 #endif
@@ -92,7 +92,7 @@ int gnutls_set_kx_priority( GNUTLS_STATE state, GNUTLS_LIST) {
        va_start( ap, state);
 
 #ifdef USE_VA_COPY
-       va_copy( _ap, ap);
+       VA_COPY( _ap, ap);
 #else
        _ap = ap;
 #endif
@@ -137,7 +137,7 @@ int gnutls_set_mac_priority( GNUTLS_STATE state, GNUTLS_LIST) {
        va_start( ap, state);
 
 #ifdef USE_VA_COPY
-       va_copy( _ap, ap);
+       VA_COPY( _ap, ap);
 #else
        _ap = ap;
 #endif
@@ -182,7 +182,7 @@ int gnutls_set_compression_priority( GNUTLS_STATE state, GNUTLS_LIST) {
        va_start( ap, state);
 
 #ifdef USE_VA_COPY
-       va_copy( _ap, ap);
+       VA_COPY( _ap, ap);
 #else
        _ap = ap;
 #endif
@@ -226,7 +226,7 @@ int gnutls_set_protocol_priority( GNUTLS_STATE state, GNUTLS_LIST) {
        va_start( ap, state);
 
 #ifdef USE_VA_COPY
-       va_copy( _ap, ap);
+       VA_COPY( _ap, ap);
 #else
        _ap = ap;
 #endif