Change license from GPLv2+ to GPLv3+.

[pspp-builds.git] / src / libpspp / message.h

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index ba35b35104c9c67736dd52f21abe5130c1405ffa..be4ba3e21dcba2f25e68aa98a3f1674d97dc13d9 100644 (file)
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000, 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 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 MESSAGE_H
 #define MESSAGE_H 1
@@ -25,7 +22,7 @@
 #include <libpspp/compiler.h>
 
 /* What kind of message is this? */
-enum msg_category 
+enum msg_category
   {
     MSG_GENERAL,        /* General info. */
     MSG_SYNTAX,         /* Messages that relate to syntax files. */
@@ -33,7 +30,7 @@ enum msg_category
   };
 
 /* How important a condition is it? */
-enum msg_severity 
+enum msg_severity
   {
     MSG_ERROR,
     MSG_WARNING,
@@ -51,20 +48,20 @@ enum msg_class
 
 
 static inline enum msg_category
-msg_class_to_category (enum msg_class class) 
+msg_class_to_category (enum msg_class class)
 {
   return class / 3;
 }
 
 static inline enum msg_severity
-msg_class_to_severity (enum msg_class class) 
+msg_class_to_severity (enum msg_class class)
 {
   return class % 3;
 }
 
 static inline enum msg_class
 msg_class_from_category_and_severity (enum msg_category category,
-                                      enum msg_severity severity) 
+                                      enum msg_severity severity)
 {
   return category * 3 + severity;
 }