Update all #include directives to the currently preferred style.

[pspp-builds.git] / src / libpspp / integer-format.h

diff --git a/src/libpspp/integer-format.h b/src/libpspp/integer-format.h
index 546a786f4807343dac63dfde0a51bd69c06a2fce..e888292f27d0214ab19fc746c7650777f882067a 100644 (file)
--- a/src/libpspp/integer-format.h
+++ b/src/libpspp/integer-format.h
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2006, 2011 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/>. */
 
 #ifndef LIBPSPP_INTEGER_FORMAT_H
 #define LIBPSPP_INTEGER_FORMAT_H 1
@@ -22,7 +20,7 @@
 #include <byteswap.h>
 #include <stdint.h>
 
-#include <libpspp/str.h>
+#include "libpspp/str.h"
 
 /* An integer format. */
 enum integer_format
@@ -40,7 +38,7 @@ enum integer_format
 #endif
   };
 
-void integer_convert (enum integer_format, const void *, 
+void integer_convert (enum integer_format, const void *,
                       enum integer_format, void *,
                       size_t);
 uint64_t integer_get (enum integer_format, const void *, size_t);