From 6ed74d8699a65ef63f04ccef33ab1c8600d6eb9f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 30 Sep 2009 21:45:47 -0700 Subject: [PATCH] Upgrade to latest Gnulib version and fix resulting FreeBSD build failures. Upgrading the Gnulib version exposed a couple of failures to #include at the very top of a source file via build failures on FreeBSD 7.2-RELEASE, fixed by this commit. This probably also fixes a similar OpenBSD issue reported by Jason Stover at http://lists.gnu.org/archive/html/pspp-dev/2009-09/msg00095.html --- README.Git | 8 ++++---- lib/linreg/sweep.c | 4 +++- src/libpspp/getl.c | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.Git b/README.Git index da2b50e6..753423e3 100644 --- a/README.Git +++ b/README.Git @@ -34,11 +34,11 @@ This version of PSPP should work with the Gnulib commit shown below. Gnulib does not maintain a stable API or ABI, so it is possible that PSPP will not work with older or newer versions of Gnulib. - commit 9de26050ef8a950fd62ebadeeab2eb7505631028 - Author: Eric Blake - Date: Wed Sep 2 17:06:43 2009 -0600 + commit e21985ad14508137d75b0dccf064adfc4e5888c6 + Author: Bruno Haible + Date: Mon Sep 28 23:25:49 2009 +0200 - errno: use consistently + Avoid identifier clash with POSIX function 'remove' defined as a macro. To clone Gnulib into a directory named "gnulib" using Git, and then check out this particular commit, run these commands: diff --git a/lib/linreg/sweep.c b/lib/linreg/sweep.c index bbab8e2a..000a5e3e 100644 --- a/lib/linreg/sweep.c +++ b/lib/linreg/sweep.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2009 Free Software Foundation, Inc. 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 @@ -40,6 +40,8 @@ Springer. 1998. ISBN 0-387-98542-5. */ +#include + #include "sweep.h" /* diff --git a/src/libpspp/getl.c b/src/libpspp/getl.c index 1214b95c..302cd913 100644 --- a/src/libpspp/getl.c +++ b/src/libpspp/getl.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc. 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 @@ -14,9 +14,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include #include +#include + #include "getl.h" #include -- 2.30.2