completely get rid of NeedNestedPrototypes

completely get rid of NeedVarargsPrototypes
remove a lot of NeedFunctionPrototypes
ansify many function declarations
This commit is contained in:
Warren Turkal 2004-02-18 02:12:44 +00:00
parent b146ef1548
commit a27ffd2678

View File

@ -34,18 +34,15 @@
#include <gcstruct.h> #include <gcstruct.h>
typedef void (* typeFillSpans)( typedef void (* typeFillSpans)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*nInit*/, int /*nInit*/,
DDXPointPtr /*pptInit*/, DDXPointPtr /*pptInit*/,
int * /*pwidthInit*/, int * /*pwidthInit*/,
int /*fSorted*/ int /*fSorted*/
#endif
); );
typedef void (* typeSetSpans)( typedef void (* typeSetSpans)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
char * /*psrc*/, char * /*psrc*/,
@ -53,11 +50,9 @@ typedef void (* typeSetSpans)(
int * /*pwidth*/, int * /*pwidth*/,
int /*nspans*/, int /*nspans*/,
int /*fSorted*/ int /*fSorted*/
#endif
); );
typedef void (* typePutImage)( typedef void (* typePutImage)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*depth*/, int /*depth*/,
@ -68,11 +63,9 @@ typedef void (* typePutImage)(
int /*leftPad*/, int /*leftPad*/,
int /*format*/, int /*format*/,
char * /*pBits*/ char * /*pBits*/
#endif
); );
typedef RegionPtr (* typeCopyArea)( typedef RegionPtr (* typeCopyArea)(
#if NeedNestedPrototypes
DrawablePtr /*pSrc*/, DrawablePtr /*pSrc*/,
DrawablePtr /*pDst*/, DrawablePtr /*pDst*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
@ -82,11 +75,9 @@ typedef RegionPtr (* typeCopyArea)(
int /*h*/, int /*h*/,
int /*dstx*/, int /*dstx*/,
int /*dsty*/ int /*dsty*/
#endif
); );
typedef RegionPtr (* typeCopyPlane)( typedef RegionPtr (* typeCopyPlane)(
#if NeedNestedPrototypes
DrawablePtr /*pSrcDrawable*/, DrawablePtr /*pSrcDrawable*/,
DrawablePtr /*pDstDrawable*/, DrawablePtr /*pDstDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
@ -97,130 +88,104 @@ typedef RegionPtr (* typeCopyPlane)(
int /*dstx*/, int /*dstx*/,
int /*dsty*/, int /*dsty*/,
unsigned long /*bitPlane*/ unsigned long /*bitPlane*/
#endif
); );
typedef void (* typePolyPoint)( typedef void (* typePolyPoint)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*mode*/, int /*mode*/,
int /*npt*/, int /*npt*/,
DDXPointPtr /*pptInit*/ DDXPointPtr /*pptInit*/
#endif
); );
typedef void (* typePolylines)( typedef void (* typePolylines)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*mode*/, int /*mode*/,
int /*npt*/, int /*npt*/,
DDXPointPtr /*pptInit*/ DDXPointPtr /*pptInit*/
#endif
); );
typedef void (* typePolySegment)( typedef void (* typePolySegment)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*nseg*/, int /*nseg*/,
xSegment * /*pSegs*/ xSegment * /*pSegs*/
#endif
); );
typedef void (* typePolyRectangle)( typedef void (* typePolyRectangle)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*nrects*/, int /*nrects*/,
xRectangle * /*pRects*/ xRectangle * /*pRects*/
#endif
); );
typedef void (* typePolyArc)( typedef void (* typePolyArc)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*narcs*/, int /*narcs*/,
xArc * /*parcs*/ xArc * /*parcs*/
#endif
); );
typedef void (* typeFillPolygon)( typedef void (* typeFillPolygon)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*shape*/, int /*shape*/,
int /*mode*/, int /*mode*/,
int /*count*/, int /*count*/,
DDXPointPtr /*pPts*/ DDXPointPtr /*pPts*/
#endif
); );
typedef void (* typePolyFillRect)( typedef void (* typePolyFillRect)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*nrectFill*/, int /*nrectFill*/,
xRectangle * /*prectInit*/ xRectangle * /*prectInit*/
#endif
); );
typedef void (* typePolyFillArc)( typedef void (* typePolyFillArc)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*narcs*/, int /*narcs*/,
xArc * /*parcs*/ xArc * /*parcs*/
#endif
); );
typedef int (* typePolyText8)( typedef int (* typePolyText8)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*x*/, int /*x*/,
int /*y*/, int /*y*/,
int /*count*/, int /*count*/,
char * /*chars*/ char * /*chars*/
#endif
); );
typedef int (* typePolyText16)( typedef int (* typePolyText16)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*x*/, int /*x*/,
int /*y*/, int /*y*/,
int /*count*/, int /*count*/,
unsigned short * /*chars*/ unsigned short * /*chars*/
#endif
); );
typedef void (* typeImageText8)( typedef void (* typeImageText8)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*x*/, int /*x*/,
int /*y*/, int /*y*/,
int /*count*/, int /*count*/,
char * /*chars*/ char * /*chars*/
#endif
); );
typedef void (* typeImageText16)( typedef void (* typeImageText16)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*x*/, int /*x*/,
int /*y*/, int /*y*/,
int /*count*/, int /*count*/,
unsigned short * /*chars*/ unsigned short * /*chars*/
#endif
); );
typedef void (* typeImageGlyphBlt)( typedef void (* typeImageGlyphBlt)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*x*/, int /*x*/,
@ -228,11 +193,9 @@ typedef void (* typeImageGlyphBlt)(
unsigned int /*nglyph*/, unsigned int /*nglyph*/,
CharInfoPtr * /*ppci*/, CharInfoPtr * /*ppci*/,
pointer /*pglyphBase*/ pointer /*pglyphBase*/
#endif
); );
typedef void (* typePolyGlyphBlt)( typedef void (* typePolyGlyphBlt)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/, GCPtr /*pGC*/,
int /*x*/, int /*x*/,
@ -240,11 +203,9 @@ typedef void (* typePolyGlyphBlt)(
unsigned int /*nglyph*/, unsigned int /*nglyph*/,
CharInfoPtr * /*ppci*/, CharInfoPtr * /*ppci*/,
pointer /*pglyphBase*/ pointer /*pglyphBase*/
#endif
); );
typedef void (* typePushPixels)( typedef void (* typePushPixels)(
#if NeedNestedPrototypes
GCPtr /*pGC*/, GCPtr /*pGC*/,
PixmapPtr /*pBitMap*/, PixmapPtr /*pBitMap*/,
DrawablePtr /*pDst*/, DrawablePtr /*pDst*/,
@ -252,7 +213,6 @@ typedef void (* typePushPixels)(
int /*h*/, int /*h*/,
int /*x*/, int /*x*/,
int /*y*/ int /*y*/
#endif
); );
static RegionPtr static RegionPtr