Change license from GPLv2+ to GPLv3+.

[pspp-builds.git] / src / output / output.h

diff --git a/src/output/output.h b/src/output/output.h
index 6782a11e66fe93a552ee85b27989e4aa1f4de821..32ad6cef96f4d1946a10535f0ff8e26b109f2005 100644 (file)
--- a/src/output/output.h
+++ b/src/output/output.h
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000 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/>. */
 
 #if !output_h
 #define output_h 1
@@ -42,7 +39,7 @@ enum outp_justification
     OUTP_CENTER,                /* Center justification. */
   };
 
-enum outp_font 
+enum outp_font
   {
     OUTP_FIXED,                 /* Fixed-width font. */
     OUTP_PROPORTIONAL,          /* Proportional font. */
@@ -78,7 +75,7 @@ struct outp_class
 
     /* special != 0 only. */
     void (*submit) (struct outp_driver *, struct som_entity *);
-    
+
     /* special == 0 only.  */
     void (*line) (struct outp_driver *, int x0, int y0, int x1, int y1,
                   enum outp_line_style top, enum outp_line_style left,
@@ -103,7 +100,7 @@ enum
 struct outp_driver
   {
     struct outp_driver *next, *prev; /* List of drivers. */
-    struct outp_class *class;  /* Driver class. */
+    const struct outp_class *class;    /* Driver class. */
     char *name;                        /* Name of this driver. */
     bool page_open;            /* 1=page is open, 0=page is closed. */
     int device;                        /* Zero or more of OUTP_DEV_*. */
@@ -128,8 +125,6 @@ struct outp_option
     int subcat;                        /* Subcategory. */
   };
 
-/* List of configured output drivers. */
-extern struct outp_driver *outp_driver_list;
 
 /* Title, subtitle. */
 extern char *outp_title;
@@ -152,7 +147,7 @@ bool outp_parse_options (struct substring options,
                          bool (*) (struct outp_driver *, const char *key,
                                    const struct string *value),
                          struct outp_driver *);
-int outp_match_keyword (const char *, struct outp_option *, int *);
+int outp_match_keyword (const char *, const struct outp_option *, int *);
 
 int outp_evaluate_dimension (char *, char **);
 bool outp_get_paper_size (char *, int *h, int *v);