Changeset 476 for trunk/src

Timestamp:

Jun 1, 2015, 6:58:33 PM (10 years ago)

Author:

katerina

Message:

Fix for ticket #373 (better autoconf macro for va_copy).

Location:

trunk/src

Files:

• sh_error.c (modified) (2 diffs)
• slib.c (modified) (3 diffs)

trunk/src/sh_error.c

@@ -1574 +1574 @@
 }
 
-#if !defined(VA_COPY)
-#if defined(__GNUC__) && defined(__PPC__) && (defined(_CALL_SYSV) || defined(_WIN32))
-#define VA_COPY(ap1, ap2)     (*(ap1) = *(ap2))
-#elif defined(VA_COPY_AS_ARRAY)
-#define VA_COPY(ap1, ap2)     memmove ((ap1), (ap2), sizeof (va_list))
-#else /* va_list is a pointer */
-#define VA_COPY(ap1, ap2)     ((ap1) = (ap2))
-#endif
-#endif 
-
 
 /* print an error  into string
@@ -1717 +1707 @@
   else 
     {
-      /* use VA_COPY */
-      /*@i@*/VA_COPY(vl2, vl);
+      /* use va_copy */
+      /*@i@*/va_copy(vl2, vl);
       len      = sl_strlen(lmsg->msg);
       /*@i@*/required = sl_vsnprintf(&(lmsg->msg[len]), 

trunk/src/slib.c

@@ -587 +587 @@
 
 
-#if !defined (VA_COPY)
-#if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))
-#define VA_COPY(ap1, ap2)     (*(ap1) = *(ap2))
-#elif defined (VA_COPY_AS_ARRAY)
-#define VA_COPY(ap1, ap2)     memmove ((ap1), (ap2), sizeof (va_list))
-#else /* va_list is a pointer */
-#define VA_COPY(ap1, ap2)     ((ap1) = (ap2))
-#endif
-#endif 
-
 #if !defined(HAVE_VSNPRINTF) || defined(HAVE_BROKEN_VSNPRINTF)
 static
@@ -784 +774 @@
   str[n-1] = '\0';
 #else
-  VA_COPY (vl2, vl);                     /* save the argument list           */
+  va_copy(vl2, vl);                      /* save the argument list           */
   total = sl_printf_count (format, vl);
   len = (int) total;
@@ -830 +820 @@
   str[n-1] = '\0';
 #else
-  VA_COPY (vl2, vl);                   /* save the argument list           */
+  va_copy(vl2, vl);                    /* save the argument list           */
   total = sl_printf_count (format, vl);
   if (total < n)