Add va_copy.h header instead of inlining a definition.

[pspp-builds.git] / src / libpspp / str.c

diff --git a/src/libpspp/str.c b/src/libpspp/str.c
index c4ce9c512b74a94a919dc06aff46d9983b5b5c38..cd9f1aa6f0159f7585778cdc02d0f56d9c03b263 100644 (file)
--- a/src/libpspp/str.c
+++ b/src/libpspp/str.c
@@ -18,13 +18,17 @@
    02110-1301, USA. */
 
 #include <config.h>
+
 #include "str.h"
-#include "message.h"
+
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "message.h"
+
+#include <libpspp/va_copy.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
+
 #include "minmax.h"
 #include "size_max.h"
 \f
@@ -714,10 +718,6 @@ ds_vprintf (struct string *st, const char *format, va_list args_)
   int avail, needed;
   va_list args;
 
-#ifndef va_copy
-#define va_copy(DST, SRC) (DST) = (SRC)
-#endif
-
   va_copy (args, args_);
   avail = st->string != NULL ? st->capacity - st->length + 1 : 0;
   needed = vsnprintf (st->string + st->length, avail, format, args);