diff options
author | Robin Watts <robin.watts@artifex.com> | 2018-12-17 11:18:07 +0000 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2019-01-07 19:42:24 +0000 |
commit | e91b67894a28c518b34e0daf75d79715c4aa16e4 (patch) | |
tree | e057e05b39777354949d3a2752a5743a86462604 /base/gxcspace.h | |
parent | 763a5f4c3bf94cd7cc3d9fcdcde3d7cac4f38796 (diff) | |
download | ghostpdl-e91b67894a28c518b34e0daf75d79715c4aa16e4.tar.gz |
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.
Diffstat (limited to 'base/gxcspace.h')
-rw-r--r-- | base/gxcspace.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/base/gxcspace.h b/base/gxcspace.h index be233dfa4..5680a75a9 100644 --- a/base/gxcspace.h +++ b/base/gxcspace.h @@ -25,23 +25,9 @@ #include "gscsel.h" #include "gxfrac.h" /* for concrete colors */ #include "gxcindex.h" /* for gx_color_index */ - -/* Define opaque types. */ - -#ifndef gx_device_color_DEFINED -# define gx_device_color_DEFINED -typedef struct gx_device_color_s gx_device_color; -#endif - -#ifndef gx_device_DEFINED -# define gx_device_DEFINED -typedef struct gx_device_s gx_device; -#endif - -#ifndef stream_DEFINED -# define stream_DEFINED -typedef struct stream_s stream; -#endif +#include "gsdevice.h" +#include "gsdcolor.h" +#include "scommon.h" /* Color space types (classes): */ /*typedef struct gs_color_space_type_s gs_color_space_type; */ |