- Timestamp:
- Jun 1, 2015, 6:58:33 PM (9 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/sh_error.c
r444 r476 1574 1574 } 1575 1575 1576 #if !defined(VA_COPY)1577 #if defined(__GNUC__) && defined(__PPC__) && (defined(_CALL_SYSV) || defined(_WIN32))1578 #define VA_COPY(ap1, ap2) (*(ap1) = *(ap2))1579 #elif defined(VA_COPY_AS_ARRAY)1580 #define VA_COPY(ap1, ap2) memmove ((ap1), (ap2), sizeof (va_list))1581 #else /* va_list is a pointer */1582 #define VA_COPY(ap1, ap2) ((ap1) = (ap2))1583 #endif1584 #endif1585 1586 1576 1587 1577 /* print an error into string … … 1717 1707 else 1718 1708 { 1719 /* use VA_COPY*/1720 /*@i@*/ VA_COPY(vl2, vl);1709 /* use va_copy */ 1710 /*@i@*/va_copy(vl2, vl); 1721 1711 len = sl_strlen(lmsg->msg); 1722 1712 /*@i@*/required = sl_vsnprintf(&(lmsg->msg[len]), -
trunk/src/slib.c
r473 r476 587 587 588 588 589 #if !defined (VA_COPY)590 #if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))591 #define VA_COPY(ap1, ap2) (*(ap1) = *(ap2))592 #elif defined (VA_COPY_AS_ARRAY)593 #define VA_COPY(ap1, ap2) memmove ((ap1), (ap2), sizeof (va_list))594 #else /* va_list is a pointer */595 #define VA_COPY(ap1, ap2) ((ap1) = (ap2))596 #endif597 #endif598 599 589 #if !defined(HAVE_VSNPRINTF) || defined(HAVE_BROKEN_VSNPRINTF) 600 590 static … … 784 774 str[n-1] = '\0'; 785 775 #else 786 VA_COPY (vl2, vl);/* save the argument list */776 va_copy(vl2, vl); /* save the argument list */ 787 777 total = sl_printf_count (format, vl); 788 778 len = (int) total; … … 830 820 str[n-1] = '\0'; 831 821 #else 832 VA_COPY (vl2, vl);/* save the argument list */822 va_copy(vl2, vl); /* save the argument list */ 833 823 total = sl_printf_count (format, vl); 834 824 if (total < n)
Note:
See TracChangeset
for help on using the changeset viewer.