#include <config.h>
#include "output.h"
-#include "message.h"
+#include <libpspp/message.h>
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
-#include "alloc.h"
-#include "message.h"
-#include "filename.h"
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
+#include <data/filename.h>
#include "htmlP.h"
-#include "misc.h"
-#include "settings.h"
-#include "str.h"
+#include "intprops.h"
+#include <libpspp/misc.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
static const char *
find_defn_value (const char *key)
{
- static char buf[INT_DIGITS + 1];
+ static char buf[INT_STRLEN_BOUND (int) + 1];
struct outp_defn *d;
for (d = outp_macros; d; d = d->next)
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);
struct outp_driver *
outp_drivers (struct outp_driver *d)
{
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
struct outp_driver *orig_d = d;
#endif