From 2a7b5ed5419633abfbbc9f929b20e888227b490c Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 10 May 2006 03:47:38 +0000 Subject: [PATCH] Use from gnulib instead of our home-grown va_copy.h. --- ChangeLog | 4 ++++ Smake | 1 + src/libpspp/ChangeLog | 7 +++++++ src/libpspp/automake.mk | 1 - src/libpspp/str.c | 1 - src/libpspp/va_copy.h | 33 --------------------------------- 6 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 src/libpspp/va_copy.h diff --git a/ChangeLog b/ChangeLog index 19c3178b..5e5f9897 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue May 9 20:46:06 2006 Ben Pfaff + + * Smake: Add stdarg to GNULIB_MODULES. + Sun May 7 09:27:40 WST 2006 John Darrington * po/en_GB.po : Removed. Now that messages talking about coloUrs have diff --git a/Smake b/Smake index 1eac2148..d9fd0d31 100644 --- 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 386d317c..6e029143 100644 --- a/src/libpspp/ChangeLog +++ b/src/libpspp/ChangeLog @@ -1,3 +1,10 @@ +Tue May 9 09:56:57 2006 Ben Pfaff + + * 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 * pool.c (pool_vasprintf): New function. diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk index 1b5c3528..82fe0573 100644 --- 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 cd9f1aa6..70edaeed 100644 --- a/src/libpspp/str.c +++ b/src/libpspp/str.c @@ -25,7 +25,6 @@ #include #include -#include #include #include diff --git a/src/libpspp/va_copy.h b/src/libpspp/va_copy.h deleted file mode 100644 index fdbf81a2..00000000 --- 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 . - - 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 - -#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 */ -- 2.30.2