[Pspp-cvs] pspp/src/output ChangeLog html.c output.c posts...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/03/04 21:51:08

Modified files:
        src/output     : ChangeLog html.c output.c postscript.c 

Log message:
        Get rid of NO_HTML, NO_POSTSCRIPT.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/ChangeLog.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/html.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/output.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/postscript.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: pspp/src/output/ChangeLog
diff -u pspp/src/output/ChangeLog:1.1 pspp/src/output/ChangeLog:1.2
--- pspp/src/output/ChangeLog:1.1       Sat Mar  4 01:11:58 2006
+++ pspp/src/output/ChangeLog   Sat Mar  4 21:51:08 2006
@@ -1,3 +1,14 @@
+Sat Mar  4 13:48:16 2006  Ben Pfaff  <address@hidden>
+
+       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 <address@hidden>
        
        * Moved files from src directory
Index: pspp/src/output/html.c
diff -u pspp/src/output/html.c:1.2 pspp/src/output/html.c:1.3
--- pspp/src/output/html.c:1.2  Sat Mar  4 21:00:38 2006
+++ pspp/src/output/html.c      Sat Mar  4 21:51:08 2006
@@ -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 @@
   html_finalise_chart
 
 };
-
-#endif /* !NO_HTML */
-
Index: pspp/src/output/output.c
diff -u pspp/src/output/output.c:1.3 pspp/src/output/output.c:1.4
--- pspp/src/output/output.c:1.3        Sat Mar  4 21:26:39 2006
+++ pspp/src/output/output.c    Sat Mar  4 21:51:08 2006
@@ -220,23 +220,15 @@
 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);
Index: pspp/src/output/postscript.c
diff -u pspp/src/output/postscript.c:1.3 pspp/src/output/postscript.c:1.4
--- pspp/src/output/postscript.c:1.3    Sat Mar  4 21:00:38 2006
+++ pspp/src/output/postscript.c        Sat Mar  4 21:51:08 2006
@@ -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 @@
   ps_chart_finalise
 
 };
-
-#endif /* NO_POSTSCRIPT */