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

diff --git a/base/gsmatrix.h b/base/gsmatrix.h
index ab29bd972..cd51f6af1 100644
--- a/base/gsmatrix.h
+++ b/base/gsmatrix.h
@@ -20,6 +20,7 @@
 #  define gsmatrix_INCLUDED
 
 #include "gstypes.h"
+#include "scommon.h"
 
 /* See p. 65 of the PostScript manual for the semantics of */
 /* transformation matrices. */
@@ -37,14 +38,8 @@ struct gs_matrix_double_s {
   double xx, xy, yx, yy, tx, ty;
 };
 
-#ifndef gs_matrix_DEFINED
-#  define gs_matrix_DEFINED
 typedef struct gs_matrix_s gs_matrix;
-#endif
-#ifndef gs_matrix_double_DEFINED
-#  define gs_matrix_double_DEFINED
 typedef struct gs_matrix_double_s gs_matrix_double;
-#endif
 
 /* Macro for initializing constant matrices */
 #define constant_matrix_body(xx, xy, yx, yy, tx, ty)\
@@ -89,10 +84,6 @@ int gs_point_transform(double, double, const gs_matrix *, gs_point *),
     gs_bbox_transform_inverse(const gs_rect *, const gs_matrix *, gs_rect *);
 
 /* Serialization */
-#ifndef stream_DEFINED
-#  define stream_DEFINED
-typedef struct stream_s stream;
-#endif
 int sget_matrix(stream *, gs_matrix *);
 int sput_matrix(stream *, const gs_matrix *);