X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flibpspp%2Fhash.c;h=9da3deb120a92ba0ee3423f78441ad85dd9ab22f;hb=7154ba03964f5edfc321b7625a3ed3524d54a38c;hp=2afd15f07681a469fc65c9960d100b7ac9abb7dc;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp-builds.git

diff --git a/src/libpspp/hash.c b/src/libpspp/hash.c
index 2afd15f0..9da3deb1 100644
--- a/src/libpspp/hash.c
+++ b/src/libpspp/hash.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000 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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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 3 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.
+   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. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include <stdbool.h>
@@ -26,12 +24,12 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include "array.h"
-#include "alloc.h"
 #include "compiler.h"
 #include "misc.h"
 #include "str.h"
 #include "pool.h"
 
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -451,7 +449,7 @@ hsh_sort_copy (struct hsh_table *h)
    to a pointer to that entry; otherwise returns a pointer to a
    NULL entry which *must* be used to insert a new entry having
    the same key data.  */
-inline void **
+void **
 hsh_probe (struct hsh_table *h, const void *target)
 {
   unsigned i;