Make PXL operator definitions public to clean up many lacking

prototype warnings.

git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@10029 a1074d23-0009-0410-80fe-cf8c14f379e6

10 files changed, 109 insertions, 102 deletions

diff --git a/pxl/pxfont.c b/pxl/pxfont.c
index 5a2207dc4..8c1318828 100644
--- a/pxl/pxfont.c
+++ b/pxl/pxfont.c
@@ -37,6 +37,7 @@
 #include "gxchar.h"
 #include "gxpath.h"
 #include "gzstate.h"
+#include "pxptable.h"
 
 /* ---------------- Initialization ---------------- */
 
diff --git a/pxl/pxgstate.c b/pxl/pxgstate.c
index 6d33d3a89..8004792c5 100644
--- a/pxl/pxgstate.c
+++ b/pxl/pxgstate.c
@@ -36,6 +36,7 @@
 #include "gzstate.h"
 #include "gscolor2.h"
 #include "plsrgb.h"
+#include "pxptable.h"
 
 /*
  * There is an apparent bug in the LJ5 and LJ6MP firmware that causes
diff --git a/pxl/pximage.c b/pxl/pximage.c
index b854a0b45..068cddf9b 100644
--- a/pxl/pximage.c
+++ b/pxl/pximage.c
@@ -45,6 +45,7 @@
 #include "jpeglib_.h"           /* for jpeg filter */
 #include "sdct.h"
 #include "sjpeg.h"
+#include "pxptable.h"
 
 /* Define the "freeing" procedure for patterns in a dictionary. */
 void
diff --git a/pxl/pxink.c b/pxl/pxink.c
index 1d23beecb..b5f4a1f79 100644
--- a/pxl/pxink.c
+++ b/pxl/pxink.c
@@ -36,6 +36,7 @@
 #include "gxstate.h"
 #include "plsrgb.h"
 #include "plht.h"
+#include "pxptable.h"
 
 /*
  * Contrary to the documentation, SetColorSpace apparently doesn't set the
diff --git a/pxl/pxl.mak b/pxl/pxl.mak
index 1f57aeee9..c37df2bd3 100644
--- a/pxl/pxl.mak
+++ b/pxl/pxl.mak
@@ -134,14 +134,14 @@ $(PXLOBJ)pxfont.$(OBJ): $(PXLSRC)pxfont.c $(AK) $(math__h) $(stdio__h) $(string_
  $(gspaint_h) $(gspath_h) $(gsstate_h) $(gsstruct_h) $(gsutil_h)\
  $(gxchar_h) $(gxfixed_h) $(gxfont_h) $(gxfont42_h) $(gxpath_h) $(gzstate_h)\
  $(plvalue_h)\
- $(pxfont_h) $(pxoper_h) $(pxstate_h)
+ $(pxfont_h) $(pxoper_h) $(pxptable_h) $(pxstate_h)
 	$(PXLCCC) $(UFST_INCLUDES) $(PXLSRC)pxfont.c $(PXLO_)pxfont.$(OBJ)
 
 $(PXLOBJ)pxgstate.$(OBJ): $(PXLSRC)pxgstate.c $(AK) $(math__h) $(memory__h) $(stdio__h)\
  $(gscoord_h) $(gsimage_h) $(gsmemory_h) $(gspath_h) $(gspath2_h) $(gsrop_h)\
  $(gsstate_h) $(gsstruct_h)  $(gdebug_h) $(gscie_h) $(gscolor2_h) $(gstypes_h)\
  $(gxcspace_h) $(gxpath_h) $(gzstate_h)\
- $(pxoper_h) $(pxstate_h)  $(plsrgb_h)
+ $(pxoper_h) $(pxptable_h) $(pxstate_h)  $(plsrgb_h)
 	$(PXLCCC) $(PXLSRC)pxgstate.c $(PXLO_)pxgstate.$(OBJ)
 
 $(PXLOBJ)pximage.$(OBJ): $(PXLSRC)pximage.c $(AK) $(std_h)\
@@ -150,27 +150,27 @@ $(PXLOBJ)pximage.$(OBJ): $(PXLSRC)pximage.c $(AK) $(std_h)\
  $(gxbitmap_h) $(gxcspace_h) $(gxdevice_h) $(gxcolor2_h) $(gxpcolor_h)\
  $(scommon_h) $(srlx_h) $(strimpl_h) $(gxdcolor_h) \
  $(pldraw_h) $(jpeglib__h) $(sdct_h) $(sjpeg_h)\
- $(pxerrors_h) $(pxoper_h) $(pxstate_h) $(plsrgb_h) $(gdebug_h)
+ $(pxerrors_h) $(pxptable_h) $(pxoper_h) $(pxstate_h) $(plsrgb_h) $(gdebug_h)
 	$(PXLCCC) $(PXLSRC)pximage.c $(PXLO_)pximage.$(OBJ)
 
 $(PXLOBJ)pxink.$(OBJ): $(PXLSRC)pxink.c $(math__h) $(stdio__h) $(memory__h)\
  $(gdebug_h) $(gscolor2_h) $(gscoord_h) $(gsimage_h) $(gsmemory_h) $(gspath_h)\
  $(gstypes_h) $(gscie_h) $(gscrd_h) $(gsstate_h)\
  $(gxarith_h) $(gxcspace_h) $(gxdevice_h) $(gxht_h) $(gxstate_h)\
- $(pxoper_h) $(pxstate_h) $(plht_h) $(pldraw_h)
+ $(pxoper_h) $(pxptable_h) $(pxstate_h) $(plht_h) $(pldraw_h)
 	$(PXLCCC) $(PXLSRC)pxink.c $(PXLO_)pxink.$(OBJ)
 
 $(PXLOBJ)pxpaint.$(OBJ): $(PXLSRC)pxpaint.c $(AK) $(math__h) $(stdio__h)\
  $(gscoord_h) $(gspaint_h) $(gspath_h) $(gspath2_h) $(gsrop_h) $(gsstate_h)\
  $(gxfarith_h) $(gxfixed_h) $(gxistate_h) $(gxmatrix_h) $(gxpath_h)\
- $(pxfont_h) $(pxoper_h) $(pxstate_h)
+ $(pxfont_h) $(pxoper_h) $(pxptable_h) $(pxstate_h)
 	$(PXLCCC) $(PXLSRC)pxpaint.c $(PXLO_)pxpaint.$(OBJ)
 
 $(PXLOBJ)pxsessio.$(OBJ): $(PXLSRC)pxsessio.c $(AK) $(math__h) $(stdio__h)\
  $(string__h) $(pxoper_h) $(pxstate_h) $(pxfont_h) \
  $(pjparse_h) $(gschar_h) $(gscoord_h) $(gserrors_h) $(gspaint_h) $(gsparam_h)\
  $(gsstate_h) $(gxfixed_h) $(gxpath_h) $(gxfcache_h)\
- $(gxdevice_h) $(pjtop_h) $(pllfont_h)
+ $(gxdevice_h) $(pjtop_h) $(pllfont_h) $(pxptable_h) 
 	$(PXLCCC) $(PXLSRC)pxsessio.c $(PXLO_)pxsessio.$(OBJ)
 
 $(PXLOBJ)pxstream.$(OBJ): $(PXLSRC)pxstream.c $(AK) $(memory__h)\
diff --git a/pxl/pxpaint.c b/pxl/pxpaint.c
index 4ae845fa8..c233696d7 100644
--- a/pxl/pxpaint.c
+++ b/pxl/pxpaint.c
@@ -30,6 +30,7 @@
 #include "gxistate.h"
 #include "gxmatrix.h"
 #include "gxpath.h"
+#include "pxptable.h"
 
 /*
  * The published H-P specification says that the single-object painting
diff --git a/pxl/pxptable.c b/pxl/pxptable.c
index b19b957ed..99117d3f6 100644
--- a/pxl/pxptable.c
+++ b/pxl/pxptable.c
@@ -497,10 +497,6 @@ const char *px_operator_names[0x80] = {
 
 /* ---------------- Operator definitions ---------------- */
 
-#define odef(proc, args)\
-  extern px_operator_proc(proc);\
-  extern const byte /*px_attribute*/ args[]
-
 /* Define the implementation of undefined operators. */
 static const byte apxBadOperator[] = {0, 0};
 static int
@@ -508,98 +504,6 @@ pxBadOperator(px_args_t *par, px_state_t *pxs)
 {       return_error(errorIllegalTag);
 }
 
-odef(pxBeginSession, apxBeginSession);
-odef(pxEndSession, apxEndSession);
-odef(pxBeginPage, apxBeginPage);
-odef(pxEndPage, apxEndPage);
-odef(pxVendorUnique, apxVendorUnique);
-odef(pxComment, apxComment);
-odef(pxOpenDataSource, apxOpenDataSource);
-odef(pxCloseDataSource, apxCloseDataSource);
-odef(pxBeginFontHeader, apxBeginFontHeader);
-odef(pxBeginUserDefinedLineCap, apxBeginUserDefinedLineCap);
-odef(pxEndUserDefinedLineCap, apxEndUserDefinedLineCap);
-odef(pxReadFontHeader, apxReadFontHeader);
-odef(pxEndFontHeader, apxEndFontHeader);
-odef(pxBeginChar, apxBeginChar);
-odef(pxReadChar, apxReadChar);
-odef(pxEndChar, apxEndChar);
-odef(pxRemoveFont, apxRemoveFont);
-odef(pxSetCharAttributes, apxSetCharAttributes);
-odef(pxBeginStream, apxBeginStream);
-odef(pxReadStream, apxReadStream);
-odef(pxEndStream, apxEndStream);
-odef(pxExecStream, apxExecStream);
-odef(pxRemoveStream, apxRemoveStream);
-odef(pxPopGS, apxPopGS);
-odef(pxPushGS, apxPushGS);
-odef(pxSetDefaultGS, apxSetDefaultGS);
-odef(pxSetClipReplace, apxSetClipReplace);
-odef(pxSetColorTreatment, apxSetColorTreatment);
-odef(pxSetBrushSource, apxSetBrushSource);
-odef(pxSetCharAngle, apxSetCharAngle);
-odef(pxSetCharScale, apxSetCharScale);
-odef(pxSetCharShear, apxSetCharShear);
-odef(pxSetClipIntersect, apxSetClipIntersect);
-odef(pxSetClipRectangle, apxSetClipRectangle);
-odef(pxSetClipToPage, apxSetClipToPage);
-odef(pxSetColorSpace, apxSetColorSpace);
-odef(pxSetCursor, apxSetCursor);
-odef(pxSetCursorRel, apxSetCursorRel);
-odef(pxSetHalftoneMethod, apxSetHalftoneMethod);
-odef(pxSetFillMode, apxSetFillMode);
-odef(pxSetFont, apxSetFont);
-odef(pxSetLineDash, apxSetLineDash);
-odef(pxSetLineCap, apxSetLineCap);
-odef(pxSetLineJoin, apxSetLineJoin);
-odef(pxSetMiterLimit, apxSetMiterLimit);
-odef(pxSetNeutralAxis, apxSetNeutralAxis);
-odef(pxSetPageDefaultCTM, apxSetPageDefaultCTM);
-odef(pxSetPageOrigin, apxSetPageOrigin);
-odef(pxSetPageRotation, apxSetPageRotation);
-odef(pxSetPageScale, apxSetPageScale);
-odef(pxSetPaintTxMode, apxSetPaintTxMode);
-odef(pxSetPenSource, apxSetPenSource);
-odef(pxSetPenWidth, apxSetPenWidth);
-odef(pxSetROP, apxSetROP);
-odef(pxSetSourceTxMode, apxSetSourceTxMode);
-odef(pxSetCharBoldValue, apxSetCharBoldValue);
-odef(pxSetClipMode, apxSetClipMode);
-odef(pxSetPathToClip, apxSetPathToClip);
-odef(pxSetCharSubMode, apxSetCharSubMode);
-odef(pxCloseSubPath, apxCloseSubPath);
-odef(pxNewPath, apxNewPath);
-odef(pxPaintPath, apxPaintPath);
-odef(pxArcPath, apxArcPath);
-odef(pxBezierPath, apxBezierPath);
-odef(pxBezierRelPath, apxBezierRelPath);
-odef(pxChord, apxChord);
-odef(pxChordPath, apxChordPath);
-odef(pxEllipse, apxEllipse);
-odef(pxEllipsePath, apxEllipsePath);
-odef(pxLinePath, apxLinePath);
-odef(pxLineRelPath, apxLineRelPath);
-odef(pxPie, apxPie);
-odef(pxPiePath, apxPiePath);
-odef(pxRectangle, apxRectangle);
-odef(pxRectanglePath, apxRectanglePath);
-odef(pxRoundRectangle, apxRoundRectangle);
-odef(pxRoundRectanglePath, apxRoundRectanglePath);
-odef(pxText, apxText);
-odef(pxTextPath, apxTextPath);
-odef(pxBeginImage, apxBeginImage);
-odef(pxReadImage, apxReadImage);
-odef(pxEndImage, apxEndImage);
-odef(pxBeginRastPattern, apxBeginRastPattern);
-odef(pxReadRastPattern, apxReadRastPattern);
-odef(pxEndRastPattern, apxEndRastPattern);
-odef(pxBeginScan, apxBeginScan);
-odef(pxEndScan, apxEndScan);
-odef(pxScanLineRel, apxScanLineRel);
-odef(pxSetAdaptiveHalftoning, apxSetAdaptiveHalftoning);
-odef(pxPassthrough, apxPassthrough);
-odef(pxSetColorTrapping, apxSetColorTrapping);
-
 #define none {pxBadOperator, apxBadOperator}
 
 const px_operator_definition_t px_operator_definitions[] = {
diff --git a/pxl/pxptable.h b/pxl/pxptable.h
index 8c0538cc4..f4fbadae4 100644
--- a/pxl/pxptable.h
+++ b/pxl/pxptable.h
@@ -60,4 +60,100 @@ extern const char *px_attribute_names[];
 /* This is needed even when not debugging, for producing error reports. */
 extern const char *px_operator_names[0x80];	/* tags 40-bf */
 
+#define odef(proc, args)\
+  extern px_operator_proc(proc);\
+  extern const byte /*px_attribute*/ args[]
+
+odef(pxBeginSession, apxBeginSession);
+odef(pxEndSession, apxEndSession);
+odef(pxBeginPage, apxBeginPage);
+odef(pxEndPage, apxEndPage);
+odef(pxVendorUnique, apxVendorUnique);
+odef(pxComment, apxComment);
+odef(pxOpenDataSource, apxOpenDataSource);
+odef(pxCloseDataSource, apxCloseDataSource);
+odef(pxBeginFontHeader, apxBeginFontHeader);
+odef(pxBeginUserDefinedLineCap, apxBeginUserDefinedLineCap);
+odef(pxEndUserDefinedLineCap, apxEndUserDefinedLineCap);
+odef(pxReadFontHeader, apxReadFontHeader);
+odef(pxEndFontHeader, apxEndFontHeader);
+odef(pxBeginChar, apxBeginChar);
+odef(pxReadChar, apxReadChar);
+odef(pxEndChar, apxEndChar);
+odef(pxRemoveFont, apxRemoveFont);
+odef(pxSetCharAttributes, apxSetCharAttributes);
+odef(pxBeginStream, apxBeginStream);
+odef(pxReadStream, apxReadStream);
+odef(pxEndStream, apxEndStream);
+odef(pxExecStream, apxExecStream);
+odef(pxRemoveStream, apxRemoveStream);
+odef(pxPopGS, apxPopGS);
+odef(pxPushGS, apxPushGS);
+odef(pxSetDefaultGS, apxSetDefaultGS);
+odef(pxSetClipReplace, apxSetClipReplace);
+odef(pxSetColorTreatment, apxSetColorTreatment);
+odef(pxSetBrushSource, apxSetBrushSource);
+odef(pxSetCharAngle, apxSetCharAngle);
+odef(pxSetCharScale, apxSetCharScale);
+odef(pxSetCharShear, apxSetCharShear);
+odef(pxSetClipIntersect, apxSetClipIntersect);
+odef(pxSetClipRectangle, apxSetClipRectangle);
+odef(pxSetClipToPage, apxSetClipToPage);
+odef(pxSetColorSpace, apxSetColorSpace);
+odef(pxSetCursor, apxSetCursor);
+odef(pxSetCursorRel, apxSetCursorRel);
+odef(pxSetHalftoneMethod, apxSetHalftoneMethod);
+odef(pxSetFillMode, apxSetFillMode);
+odef(pxSetFont, apxSetFont);
+odef(pxSetLineDash, apxSetLineDash);
+odef(pxSetLineCap, apxSetLineCap);
+odef(pxSetLineJoin, apxSetLineJoin);
+odef(pxSetMiterLimit, apxSetMiterLimit);
+odef(pxSetNeutralAxis, apxSetNeutralAxis);
+odef(pxSetPageDefaultCTM, apxSetPageDefaultCTM);
+odef(pxSetPageOrigin, apxSetPageOrigin);
+odef(pxSetPageRotation, apxSetPageRotation);
+odef(pxSetPageScale, apxSetPageScale);
+odef(pxSetPaintTxMode, apxSetPaintTxMode);
+odef(pxSetPenSource, apxSetPenSource);
+odef(pxSetPenWidth, apxSetPenWidth);
+odef(pxSetROP, apxSetROP);
+odef(pxSetSourceTxMode, apxSetSourceTxMode);
+odef(pxSetCharBoldValue, apxSetCharBoldValue);
+odef(pxSetClipMode, apxSetClipMode);
+odef(pxSetPathToClip, apxSetPathToClip);
+odef(pxSetCharSubMode, apxSetCharSubMode);
+odef(pxCloseSubPath, apxCloseSubPath);
+odef(pxNewPath, apxNewPath);
+odef(pxPaintPath, apxPaintPath);
+odef(pxArcPath, apxArcPath);
+odef(pxBezierPath, apxBezierPath);
+odef(pxBezierRelPath, apxBezierRelPath);
+odef(pxChord, apxChord);
+odef(pxChordPath, apxChordPath);
+odef(pxEllipse, apxEllipse);
+odef(pxEllipsePath, apxEllipsePath);
+odef(pxLinePath, apxLinePath);
+odef(pxLineRelPath, apxLineRelPath);
+odef(pxPie, apxPie);
+odef(pxPiePath, apxPiePath);
+odef(pxRectangle, apxRectangle);
+odef(pxRectanglePath, apxRectanglePath);
+odef(pxRoundRectangle, apxRoundRectangle);
+odef(pxRoundRectanglePath, apxRoundRectanglePath);
+odef(pxText, apxText);
+odef(pxTextPath, apxTextPath);
+odef(pxBeginImage, apxBeginImage);
+odef(pxReadImage, apxReadImage);
+odef(pxEndImage, apxEndImage);
+odef(pxBeginRastPattern, apxBeginRastPattern);
+odef(pxReadRastPattern, apxReadRastPattern);
+odef(pxEndRastPattern, apxEndRastPattern);
+odef(pxBeginScan, apxBeginScan);
+odef(pxEndScan, apxEndScan);
+odef(pxScanLineRel, apxScanLineRel);
+odef(pxSetAdaptiveHalftoning, apxSetAdaptiveHalftoning);
+odef(pxPassthrough, apxPassthrough);
+odef(pxSetColorTrapping, apxSetColorTrapping);
+
 #endif				/* pxptable_INCLUDED */
diff --git a/pxl/pxsessio.c b/pxl/pxsessio.c
index 6408839f7..569340738 100644
--- a/pxl/pxsessio.c
+++ b/pxl/pxsessio.c
@@ -38,6 +38,7 @@
 #include "pjtop.h"
 #include "pllfont.h"
 #include "plsrgb.h"
+#include "pxptable.h"
 
 /* Imported operators */
 px_operator_proc(pxCloseDataSource);
diff --git a/pxl/pxstream.c b/pxl/pxstream.c
index a48168373..391179a95 100644
--- a/pxl/pxstream.c
+++ b/pxl/pxstream.c
@@ -20,6 +20,7 @@
 #include "pxoper.h"
 #include "pxstate.h"
 #include "pxparse.h"
+#include "pxptable.h"
 
 /* ---------------- Internal procedures ---------------- */