From: Ben Pfaff <blp@gnu.org>
Date: Sat, 4 Mar 2006 21:51:08 +0000 (+0000)
Subject: Get rid of NO_HTML, NO_POSTSCRIPT.
X-Git-Tag: v0.6.0~1051
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b815c86970094c38080967a527c2d39312f601f1;p=pspp-builds.git

Get rid of NO_HTML, NO_POSTSCRIPT.
---

diff --git a/src/output/ChangeLog b/src/output/ChangeLog
index 4a96aeb9..4f2d1810 100644
--- a/src/output/ChangeLog
+++ b/src/output/ChangeLog
@@ -1,3 +1,14 @@
+Sat Mar  4 13:48:16 2006  Ben Pfaff  <blp@gnu.org>
+
+	We didn't provide a way to define these macros, so obviously
+	there's little demand for them.
+
+	* html.c: Don't test for NO_HTML.
+
+	* postscript.c: Don't test for NO_POSTSCRIPT.
+
+	* output.c: Don't test for either of those.
+
 Thu Mar  2 08:40:33 WST 2006 John Darrington <john@darrington.wattle.id.au>
 	
 	* Moved files from src directory
diff --git a/src/output/html.c b/src/output/html.c
index 50561df7..1cf65839 100644
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -17,9 +17,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA. */
 
-/* This #if encloses the rest of the file. */
-#if !NO_HTML
-
 #include <config.h>
 #include "chart.h"
 #include "htmlP.h"
@@ -648,6 +645,3 @@ struct outp_class html_class =
   html_finalise_chart
 
 };
-
-#endif /* !NO_HTML */
-
diff --git a/src/output/output.c b/src/output/output.c
index f6c20253..8af1a7b8 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -220,23 +220,15 @@ void
 outp_init (void)
 {
   extern struct outp_class ascii_class;
-#if !NO_POSTSCRIPT
   extern struct outp_class postscript_class;
   extern struct outp_class epsf_class;
-#endif
-#if !NO_HTML
   extern struct outp_class html_class;
-#endif
 
   char def[] = "default";
 
-#if !NO_HTML
   add_class (&html_class);
-#endif
-#if !NO_POSTSCRIPT
   add_class (&epsf_class);
   add_class (&postscript_class);
-#endif
   add_class (&ascii_class);
 
   add_name (def, &def[strlen (def)], OUTP_S_INIT_FILE);
diff --git a/src/output/postscript.c b/src/output/postscript.c
index 754559ca..1a2f256b 100644
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -19,9 +19,6 @@
 
 #include <config.h>
 
-/*this #if encloses the remainder of the file. */
-#if !NO_POSTSCRIPT
-
 #include <ctype.h>
 #include "chart.h"
 #include "message.h"
@@ -3045,5 +3042,3 @@ struct outp_class epsf_class =
   ps_chart_finalise
 
 };
-
-#endif /* NO_POSTSCRIPT */