diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/hyper/htadd.c | 9 | ||||
| -rw-r--r-- | src/hyper/hyper.h | 6 | ||||
| -rw-r--r-- | src/hyper/lex.h | 5 | ||||
| -rw-r--r-- | src/hyper/macro.c | 2 | ||||
| -rw-r--r-- | src/hyper/parse-aux.c | 1 | ||||
| -rw-r--r-- | src/hyper/parse-paste.c | 1 |
7 files changed, 16 insertions, 14 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dedd6eec..1f7213cd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-05-22 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * hyper/hyper.h: Move lexing stuff to hyper/lex.h + * hyper/htadd.c: Don't include hyper.h. Include cfuns.h and + node.h instead. + 2008-05-21 Gabriel Dos Reis <gdr@cs.tamu.edu> * hyper/hthits.c (regerr): Remove. diff --git a/src/hyper/htadd.c b/src/hyper/htadd.c index 14ffe618..c1f8af14 100644 --- a/src/hyper/htadd.c +++ b/src/hyper/htadd.c @@ -39,16 +39,17 @@ #define _HTADD_C #include "openaxiom-c-macros.h" -#include "sockio.h" -#include "hyper.h" #include <sys/stat.h> #include <errno.h> #include <setjmp.h> +#include <stdlib.h> +#include "cfuns.h" #include "hash.h" #include "lex.h" +#include "sockio.h" #include "addfile.h" - +#include "node.h" static void add_file(char*, char*, int); static void add_new_pages(FILE*, FILE*, char*, char*); @@ -108,7 +109,7 @@ main(int argc, char **argv) build_db_filename(flag, db_dir, dbfilename); if (fresh) - unlink(dbfilename); + oa_unlink(dbfilename); if (flag & Delete) while (*fnames) diff --git a/src/hyper/hyper.h b/src/hyper/hyper.h index cd716b44..f71b45ae 100644 --- a/src/hyper/hyper.h +++ b/src/hyper/hyper.h @@ -110,12 +110,6 @@ extern openaxiom_cursor gBusyCursor; /* The clock cursor for when I am busy */ extern int gIsAxiomServer; /* true iff HyperDoc is acting as an Axiom server */ extern int gArgc; /* original argc from main */ extern char **gArgv; /* original argv from main */ -/* from lex.c */ -extern long fpos, keyword_fpos; -extern Token token; -extern int last_token, input_type, last_ch; -extern char *input_string; -extern FILE *cfile; /* from input.c */ extern openaxiom_image *picked; extern int picked_height; diff --git a/src/hyper/lex.h b/src/hyper/lex.h index 244bc9bc..3a7fd8f9 100644 --- a/src/hyper/lex.h +++ b/src/hyper/lex.h @@ -65,6 +65,11 @@ extern void print_token(void); extern void token_name(int); extern void print_next_ten_tokens(void); +extern long fpos, keyword_fpos; +extern Token token; +extern int last_token, input_type, last_ch; +extern char *input_string; +extern FILE *cfile; extern short int gInSpadsrc; extern short int gInVerbatim; diff --git a/src/hyper/macro.c b/src/hyper/macro.c index aea33777..459c3235 100644 --- a/src/hyper/macro.c +++ b/src/hyper/macro.c @@ -47,8 +47,6 @@ /* #define DEBUG 1 */ -extern FILE *cfile; - /* * This routine keeps scanning until it reaches it pops off 1 more diff --git a/src/hyper/parse-aux.c b/src/hyper/parse-aux.c index 5cf233b3..e6dd7e88 100644 --- a/src/hyper/parse-aux.c +++ b/src/hyper/parse-aux.c @@ -47,7 +47,6 @@ #include "all_hyper_proto.H1" -extern FILE *cfile; extern int make_input_file; extern int gverify_dates; diff --git a/src/hyper/parse-paste.c b/src/hyper/parse-paste.c index 925c63df..0523c70e 100644 --- a/src/hyper/parse-paste.c +++ b/src/hyper/parse-paste.c @@ -56,7 +56,6 @@ #include "all_hyper_proto.H1" -extern FILE *cfile; short int gInPaste; |