projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed include paths to be explicitly specified in the #include directive.
[pspp-builds.git]
/
src
/
output
/
output.c
diff --git
a/src/output/output.c
b/src/output/output.c
index b1b404637bd76daf7d762bd7dd786be4f1af2218..4a915fe2ef6e3acd2635ada098ccf0b6a0b3f982 100644
(file)
--- a/
src/output/output.c
+++ b/
src/output/output.c
@@
-19,18
+19,19
@@
#include <config.h>
#include "output.h"
#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 <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 "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)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-194,7
+195,7
@@
expand_name (char *bp, char *ep)
static const char *
find_defn_value (const char *key)
{
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)
struct outp_defn *d;
for (d = outp_macros; d; d = d->next)
@@
-219,23
+220,15
@@
void
outp_init (void)
{
extern struct outp_class ascii_class;
outp_init (void)
{
extern struct outp_class ascii_class;
-#if !NO_POSTSCRIPT
extern struct outp_class postscript_class;
extern struct outp_class epsf_class;
extern struct outp_class postscript_class;
extern struct outp_class epsf_class;
-#endif
-#if !NO_HTML
extern struct outp_class html_class;
extern struct outp_class html_class;
-#endif
char def[] = "default";
char def[] = "default";
-#if !NO_HTML
add_class (&html_class);
add_class (&html_class);
-#endif
-#if !NO_POSTSCRIPT
add_class (&epsf_class);
add_class (&postscript_class);
add_class (&epsf_class);
add_class (&postscript_class);
-#endif
add_class (&ascii_class);
add_name (def, &def[strlen (def)], OUTP_S_INIT_FILE);
add_class (&ascii_class);
add_name (def, &def[strlen (def)], OUTP_S_INIT_FILE);
@@
-1257,7
+1250,7
@@
exit:
struct outp_driver *
outp_drivers (struct outp_driver *d)
{
struct outp_driver *
outp_drivers (struct outp_driver *d)
{
-#if
GLOBAL_
DEBUGGING
+#if DEBUGGING
struct outp_driver *orig_d = d;
#endif
struct outp_driver *orig_d = d;
#endif