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, 2 insertions, 10 deletions

diff --git a/psi/isdata.h b/psi/isdata.h
index 2ea7613d5..0600a0482 100644
--- a/psi/isdata.h
+++ b/psi/isdata.h
@@ -21,6 +21,7 @@
 #  define isdata_INCLUDED
 
 #include "iref.h"
+#include "imemory.h"
 
 /*
  * In order to detect under- and overflow with minimum overhead, we put
@@ -51,21 +52,12 @@
 typedef ref *s_ptr;
 typedef const ref *const_s_ptr;
 
-/* Define an opaque allocator type. */
-#ifndef gs_ref_memory_DEFINED
-#  define gs_ref_memory_DEFINED
-typedef struct gs_ref_memory_s gs_ref_memory_t;
-#endif
-
 /*
  * Define the state of a stack, other than the data it holds.
  * Note that the total size of a stack cannot exceed max_uint,
  * because it has to be possible to copy a stack to a PostScript array.
  */
-#ifndef ref_stack_DEFINED
-typedef struct ref_stack_s ref_stack_t;	/* also defined in idebug.h */
-#  define ref_stack_DEFINED
-#endif
+
 /*
  * We divide the stack structure into two parts: ref_stack_params_t, which
  * is set when the stack is created and (almost) never changed after that,