Use <stdarg.h> from gnulib instead of our home-grown va_copy.h.

diff --git a/ChangeLog b/ChangeLog
index 19c3178ba1c1e3decf44a4d66c515fedf0096e80..5e5f98972594bc8001bf9f044ceb7454765c4c73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May  9 20:46:06 2006  Ben Pfaff  <blp@gnu.org>
+
+       * Smake: Add stdarg to GNULIB_MODULES.
+
 Sun May  7 09:27:40 WST 2006 John Darrington <john@darrington.wattle.id.au>
 
        * po/en_GB.po : Removed.  Now that messages talking about coloUrs have 

diff --git a/Smake b/Smake
index 1eac214892e7425b58a7684b6d623c217d5d2049..d9fd0d316cb2bd8f3ff80fde789e8882d0160e6c 100644 (file)
--- a/Smake
+++ b/Smake
@@ -31,6 +31,7 @@ GNULIB_MODULES = \
        restrict \
        snprintf \
        stat-macros \
+       stdarg \
        stdbool \
        stdint \
        stpcpy \

diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog
index 386d317c77a4f6b5d11ce27da55f8965baece708..6e029143041d4448cca2f2f57ad2c71ed0ea12f5 100644 (file)
--- a/src/libpspp/ChangeLog
+++ b/src/libpspp/ChangeLog
@@ -1,3 +1,10 @@
+Tue May  9 09:56:57 2006  Ben Pfaff  <blp@gnu.org>
+
+       * va_copy.h: Removed.  Now use va_copy() provided by gnulib
+       instead.
+
+       * automake.mk: (src_libpspp_libpspp_a_SOURCES) Removed va_copy.h.
+
 Sun May  7 18:17:32 2006  Ben Pfaff  <blp@gnu.org>
 
        * pool.c (pool_vasprintf): New function.

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 1b5c352873616dd8e8b6535133d3a4265df33f9f..82fe0573c29feadc945316cfc713bcbb0c3c8121 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -28,7 +28,6 @@ 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 cd9f1aa6f0159f7585778cdc02d0f56d9c03b263..70edaeede16c0ac5bdf871d620b690cbd7118d59 100644 (file)
--- a/src/libpspp/str.c
+++ b/src/libpspp/str.c
@@ -25,7 +25,6 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include <libpspp/va_copy.h>
 #include <libpspp/alloc.h>
 #include <libpspp/message.h>
 

diff --git a/src/libpspp/va_copy.h b/src/libpspp/va_copy.h
deleted file mode 100644 (file)
index fdbf81a..0000000
--- a/src/libpspp/va_copy.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* 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 */