Add va_copy.h header instead of inlining a definition.

diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog
index e25f32807e043aee023e1b42231721caa43f39e9..ca11f306b94614ba80b829ca9d035cec684a834a 100644 (file)
--- a/src/libpspp/ChangeLog
+++ b/src/libpspp/ChangeLog
@@ -1,3 +1,10 @@
+Sun May  7 14:32:25 2006  Ben Pfaff  <blp@gnu.org>
+
+       * va_copy.h: New header.
+
+       * str.c: Use header instead of inlining va_copy() macro
+       implementation.
+
 Sun May  7 10:06:29 WST 2006 John Darrington <john@darrington.wattle.id.au>
 
        * array.c array.h: Constness of sort.

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 82fe0573c29feadc945316cfc713bcbb0c3c8121..1b5c352873616dd8e8b6535133d3a4265df33f9f 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -28,6 +28,7 @@ src_libpspp_libpspp_a_SOURCES = \
        src/libpspp/start-date.h \
        src/libpspp/str.c \
        src/libpspp/str.h \
+       src/libpspp/va_copy.h \
        src/libpspp/verbose-msg.c \
        src/libpspp/verbose-msg.h \
        src/libpspp/version.h 

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);

diff --git a/src/libpspp/va_copy.h b/src/libpspp/va_copy.h
new file mode 100644 (file)
index 0000000..fdbf81a
--- /dev/null
+++ b/src/libpspp/va_copy.h
@@ -0,0 +1,33 @@
+/* PSPP - computes sample statistics.
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   Written by Ben Pfaff <blp@gnu.org>.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
+
+#ifndef VA_COPY_H
+#define VA_COPY_H 1
+
+#include <stdarg.h>
+
+#ifndef va_copy
+#ifdef __va_copy
+#define va_copy(DST, SRC) __va_copy (DST, SRC)
+#else
+#define va_copy(DST, SRC) ((DST) = (SRC))
+#endif
+#endif
+
+#endif /* va_copy.h */