summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorajs <ajs>2004-11-25 17:14:34 +0000
committerajs <ajs>2004-11-25 17:14:34 +0000
commit4cf0d0df23f7a35a3c1570c94ba08fa96d47bfc1 (patch)
tree9894529e896b82cf957cb60c03be04f4fe9d91ea
parente5879ca1d8ea26870dbf74f330f5e6f5a9c93bfa (diff)
2004-11-25 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* zebra.h: If not C99 and there's no va_copy macro and there is a __va_copy macro, define va_copy as __va_copy.
-rw-r--r--lib/ChangeLog5
-rw-r--r--lib/zebra.h6
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index d1fa0f4c..db39f0ae 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,10 @@
2004-11-25 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+ * zebra.h: If not C99 and there's no va_copy macro and there is
+ a __va_copy macro, define va_copy as __va_copy.
+
+2004-11-25 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
* pid_output.c: (pid_output_lock) Fix 2 bugs: when locking, should
set l_whence to SEEK_SET, not SEEK_END. And after writing new
pid to file, must ftruncate to eliminate any extraneous bytes left
diff --git a/lib/zebra.h b/lib/zebra.h
index 5d0e2385..83da37c5 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -95,6 +95,12 @@ typedef int socklen_t;
/* misc include group */
#include <stdarg.h>
+#if !(defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+/* Not C99; do we need to define va_copy? */
+#if !defined(va_copy) && defined(__va_copy)
+#define va_copy(DST,SRC) __va_copy(DST,SRC)
+#endif /* need va_copy */
+#endif /* !C99 */
#include "zassert.h"
#ifdef HAVE_LCAPS