Remove some blah_DEFINED cruft.

Now we properly "include what we use" let's sanitise the horrid
blah_DEFINED ifdeffery (i.e. kill it where possible).

Also, we update the .c dependencies in the base/psi makefiles to
be correct.

Unfortunately, this new correct set of dependencies causes nmake
to soil itself and die with an out of memory error. After much
experimentation, I've come to the conclusion that this is because
it copes poorly with given the same file as a dependency multiple
times.

Sadly, our style of declaring dependencies in the following style:

 foo_h=$(BLAH)/foo.h $(std_h)
 bar_h=$(BLAH)/bar.h $(foo_h) $(std_h)
 baz_h=$(BLAH)/baz.h $(foo_h) $(std_h)

means that a .obj file that depends on $(foo_h) $(bar_h) and $(baz_h)
ends up depending on foo.h twice, and std.h three times.

I have therefore changed the style of dependencies used to be more
standard.

We still define:

 foo_h=$(BLAH)/foo.h

so each .obj file rule can depend on $(foo_h) etc as required, but the
dependencies between each .h file are expressed in normal rules at the
end of the file in a dedicated "# Dependencies" section that we can now
autogenerate.

1 files changed, 1 insertions, 4 deletions

diff --git a/psi/itoken.h b/psi/itoken.h
index 1215617c4..8ab4be591 100644
--- a/psi/itoken.h
+++ b/psi/itoken.h
@@ -20,6 +20,7 @@
 #  define itoken_INCLUDED
 
 #include "iref.h"
+#include "iscan.h"
 
 /*
  * Continue after handling a procedure stream refill or other callout
@@ -30,10 +31,6 @@ int ztokenexec_continue(i_ctx_t *i_ctx_p);
 /*
  * Handle a scan_Comment or scan_DSC_Comment return from gs_scan_token.
  */
-#ifndef scanner_state_DEFINED
-#  define scanner_state_DEFINED
-typedef struct scanner_state_s scanner_state;
-#endif
 int ztoken_handle_comment(i_ctx_t *i_ctx_p,
                           scanner_state *sstate, const ref *ptoken,
                           int scan_code, bool save, bool push_file,