From fd2428a794d4f44ac9ac899efddfc7d51a332ddf Mon Sep 17 00:00:00 2001 From: lecoanet Date: Sat, 12 Feb 2005 14:30:20 +0000 Subject: Fixed the __unused macro to avoid a clash with dummy variables used in 64 bits headers --- generic/Arc.c | 16 +++++----- generic/Curve.c | 12 ++++---- generic/Draw.c | 4 +-- generic/Field.c | 2 +- generic/Group.c | 28 ++++++++--------- generic/Icon.c | 22 +++++++------- generic/Image.c | 8 ++--- generic/Item.c | 2 +- generic/Map.c | 26 ++++++++-------- generic/MapInfo.c | 8 ++--- generic/OverlapMan.c | 4 +-- generic/PostScript.c | 36 +++++++++++----------- generic/Rectangle.c | 16 +++++----- generic/Reticle.c | 30 +++++++++--------- generic/Tabular.c | 14 ++++----- generic/Text.c | 32 +++++++++---------- generic/Track.c | 28 ++++++++--------- generic/Triangles.c | 16 +++++----- generic/Window.c | 26 ++++++++-------- generic/perfos.c | 4 +-- generic/private.h | 2 +- generic/tkZinc.c | 86 ++++++++++++++++++++++++++-------------------------- 22 files changed, 211 insertions(+), 211 deletions(-) (limited to 'generic') diff --git a/generic/Arc.c b/generic/Arc.c index 047cc35..5c0dcd2 100644 --- a/generic/Arc.c +++ b/generic/Arc.c @@ -334,7 +334,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, arc_attrs, argv[0]) == TCL_ERROR) { @@ -412,7 +412,7 @@ UpdateRenderShape(ArcItem arc) static void ComputeCoordinates(ZnItem item, - ZnBool force __unused) + ZnBool force __znunused) { ZnWInfo *wi = item->wi; ArcItem arc = (ArcItem) item; @@ -893,7 +893,7 @@ Render(ZnItem item) } #else static void -Render(ZnItem item __unused) +Render(ZnItem item __znunused) { } #endif @@ -908,7 +908,7 @@ Render(ZnItem item __unused) */ static ZnBool IsSensitive(ZnItem item, - int item_part __unused) + int item_part __znunused) { return (ISSET(item->flags, ZN_SENSITIVE_BIT) && item->parent->class->IsSensitive(item->parent, ZN_NO_PART)); @@ -1108,11 +1108,11 @@ GetContours(ZnItem item, */ static int Coords(ZnItem item, - int contour __unused, + int contour __znunused, int index, int cmd, ZnPoint **pts, - char **controls __unused, + char **controls __znunused, unsigned int *num_pts) { ArcItem arc = (ArcItem) item; @@ -1196,8 +1196,8 @@ GetAnchor(ZnItem item, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } diff --git a/generic/Curve.c b/generic/Curve.c index 1ce76e5..8531c3a 100644 --- a/generic/Curve.c +++ b/generic/Curve.c @@ -487,7 +487,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, cv_attrs, argv[0]) == TCL_ERROR) { @@ -633,7 +633,7 @@ UpdateOutlines(CurveItem cv, */ static void ComputeCoordinates(ZnItem item, - ZnBool force __unused) + ZnBool force __znunused) { ZnWInfo *wi = item->wi; CurveItem cv = (CurveItem) item; @@ -1402,7 +1402,7 @@ Render(ZnItem item) } #else static void -Render(ZnItem item __unused) +Render(ZnItem item __znunused) { } #endif @@ -1417,7 +1417,7 @@ Render(ZnItem item __unused) */ static ZnBool IsSensitive(ZnItem item, - int item_part __unused) + int item_part __znunused) { return (ISSET(item->flags, ZN_SENSITIVE_BIT) && item->parent->class->IsSensitive(item->parent, ZN_NO_PART)); @@ -1593,8 +1593,8 @@ Pick(ZnItem item, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } diff --git a/generic/Draw.c b/generic/Draw.c index 51daf57..8ed5405 100644 --- a/generic/Draw.c +++ b/generic/Draw.c @@ -309,7 +309,7 @@ ZnDrawLineShape(ZnWInfo *wi, ZnLineStyle line_style, int foreground_pixel, ZnDim line_width, - ZnLineShape shape __unused) + ZnLineShape shape __znunused) { XPoint *xpoints; unsigned int i; @@ -1146,7 +1146,7 @@ ZnRenderPolyline(ZnWInfo *wi, ZnDim line_width, ZnLineStyle line_style, int cap_style, - int join_style __unused, + int join_style __znunused, ZnLineEnd first_end, ZnLineEnd last_end, ZnGradient *gradient) diff --git a/generic/Field.c b/generic/Field.c index 1de3644..b2b6528 100644 --- a/generic/Field.c +++ b/generic/Field.c @@ -1047,7 +1047,7 @@ ConfigureField(ZnFieldSet fs, static int QueryField(ZnFieldSet fs, int field, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if ((field < 0) || ((unsigned int) field >= fs->num_fields)) { diff --git a/generic/Group.c b/generic/Group.c index 4228437..0c799fd 100644 --- a/generic/Group.c +++ b/generic/Group.c @@ -120,8 +120,8 @@ static ZnAttrConfig group_attrs[] = { */ static int Init(ZnItem item, - int *argc __unused, - Tcl_Obj *CONST *args[] __unused) + int *argc __znunused, + Tcl_Obj *CONST *args[] __znunused) { GroupItem group = (GroupItem) item; @@ -412,7 +412,7 @@ SetXShape(ZnItem grp) } #else static void -SetXShape(ZnItem grp __unused) +SetXShape(ZnItem grp __znunused) { } #endif @@ -468,7 +468,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, group_attrs, argv[0]) == TCL_ERROR) { @@ -1124,7 +1124,7 @@ Render(ZnItem item) } #else static void -Render(ZnItem item __unused) +Render(ZnItem item __znunused) { } #endif @@ -1139,7 +1139,7 @@ Render(ZnItem item __unused) */ static ZnBool IsSensitive(ZnItem item, - int item_part __unused) + int item_part __znunused) { ZnBool sensitive = ISSET(item->flags, ZN_SENSITIVE_BIT); ZnItem parent = item->parent; @@ -1319,11 +1319,11 @@ Pick(ZnItem item, */ static int Coords(ZnItem item, - int contour __unused, - int index __unused, + int contour __znunused, + int index __znunused, int cmd, ZnPoint **pts, - char **controls __unused, + char **controls __znunused, unsigned int *num_pts) { if ((cmd == ZN_COORDS_ADD) || (cmd == ZN_COORDS_ADD_LAST) || (cmd == ZN_COORDS_REMOVE)) { @@ -1367,8 +1367,8 @@ Coords(ZnItem item, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } @@ -1413,14 +1413,14 @@ ZnGroupSetCallOm(ZnItem group, } #else ZnBool -ZnGroupCallOm(ZnItem group __unused) +ZnGroupCallOm(ZnItem group __znunused) { return False; } void -ZnGroupSetCallOm(ZnItem group __unused, - ZnBool set __unused) +ZnGroupSetCallOm(ZnItem group __znunused, + ZnBool set __znunused) { return; } diff --git a/generic/Icon.c b/generic/Icon.c index 7264be5..2db3b99 100644 --- a/generic/Icon.c +++ b/generic/Icon.c @@ -112,8 +112,8 @@ static ZnAttrConfig icon_attrs[] = { */ static int Init(ZnItem item, - int *argc __unused, - Tcl_Obj *CONST *args[] __unused) + int *argc __znunused, + Tcl_Obj *CONST *args[] __znunused) { ZnWInfo *wi = item->wi; IconItem icon = (IconItem) item; @@ -227,7 +227,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, icon_attrs, argv[0]) == TCL_ERROR) { @@ -247,7 +247,7 @@ Query(ZnItem item, */ static void ComputeCoordinates(ZnItem item, - ZnBool force __unused) + ZnBool force __znunused) { ZnWInfo *wi = item->wi; IconItem icon = (IconItem) item; @@ -634,7 +634,7 @@ Render(ZnItem item) } #else static void -Render(ZnItem item __unused) +Render(ZnItem item __znunused) { } #endif @@ -649,7 +649,7 @@ Render(ZnItem item __unused) */ static ZnBool IsSensitive(ZnItem item, - int item_part __unused) + int item_part __znunused) { return (ISSET(item->flags, ZN_SENSITIVE_BIT) && item->parent->class->IsSensitive(item->parent, ZN_NO_PART)); @@ -738,8 +738,8 @@ Pick(ZnItem item, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } @@ -812,11 +812,11 @@ GetClipVertices(ZnItem item, */ static int Coords(ZnItem item, - int contour __unused, - int index __unused, + int contour __znunused, + int index __znunused, int cmd, ZnPoint **pts, - char **controls __unused, + char **controls __znunused, unsigned int *num_pts) { IconItem icon = (IconItem) item; diff --git a/generic/Image.c b/generic/Image.c index 2c6639c..bdfddb2 100644 --- a/generic/Image.c +++ b/generic/Image.c @@ -132,10 +132,10 @@ To2Power(int a) */ static void InvalidateImage(ClientData client_data, - int x __unused, - int y __unused, - int width __unused, - int height __unused, + int x __znunused, + int y __znunused, + int width __znunused, + int height __znunused, int image_width, int image_height) { diff --git a/generic/Item.c b/generic/Item.c index 1ae8983..2266029 100644 --- a/generic/Item.c +++ b/generic/Item.c @@ -186,7 +186,7 @@ InitAttrDesc(ZnAttrConfig *attr_desc) #ifndef PTK static int SetAttrFromAny(Tcl_Interp *interp, - Tcl_Obj *obj __unused) + Tcl_Obj *obj __znunused) { Tcl_AppendToObj(Tcl_GetObjResult(interp), "can't convert value to attribute except via GetAttrDesc", diff --git a/generic/Map.c b/generic/Map.c index 2640ae7..5398528 100644 --- a/generic/Map.c +++ b/generic/Map.c @@ -123,7 +123,7 @@ static ZnAttrConfig map_attrs[] = { void UpdateMapInfo(ClientData client_data, - ZnMapInfoId map_info __unused) + ZnMapInfoId map_info __znunused) { ZnItem item = (ZnItem) client_data; @@ -195,8 +195,8 @@ FreeLists(MapItem map) */ static int Init(ZnItem item, - int *argc __unused, - Tcl_Obj *CONST *args[] __unused) + int *argc __znunused, + Tcl_Obj *CONST *args[] __znunused) { MapItem map = (MapItem) item; ZnWInfo *wi = item->wi; @@ -437,7 +437,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, map_attrs, argv[0]) == TCL_ERROR) { @@ -458,7 +458,7 @@ Query(ZnItem item, static void ComputeCoordinates(ZnItem item, - ZnBool force __unused) + ZnBool force __znunused) { ZnWInfo *wi = item->wi; MapItem map = (MapItem) item; @@ -977,8 +977,8 @@ ComputeCoordinates(ZnItem item, */ static int -ToArea(ZnItem item __unused, - ZnToArea ta __unused) +ToArea(ZnItem item __znunused, + ZnToArea ta __znunused) { return -1; } @@ -1519,7 +1519,7 @@ Render(ZnItem item) } #else static void -Render(ZnItem item __unused) +Render(ZnItem item __znunused) { } #endif @@ -1534,7 +1534,7 @@ Render(ZnItem item __unused) */ static ZnBool IsSensitive(ZnItem item, - int item_part __unused) + int item_part __znunused) { return (ISSET(item->flags, ZN_SENSITIVE_BIT) && item->parent->class->IsSensitive(item->parent, ZN_NO_PART)); @@ -1554,8 +1554,8 @@ IsSensitive(ZnItem item, ********************************************************************************** */ static double -Pick(ZnItem item __unused, - ZnPick ps __unused) +Pick(ZnItem item __znunused, + ZnPick ps __znunused) { return 1e40; } @@ -1569,8 +1569,8 @@ Pick(ZnItem item __unused, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } diff --git a/generic/MapInfo.c b/generic/MapInfo.c index 9b8894e..eeba5e4 100644 --- a/generic/MapInfo.c +++ b/generic/MapInfo.c @@ -1347,7 +1347,7 @@ UpdateMapInfoClients(ZnMapInfoMaster *master) } static int -ZnCreateMapInfo(Tcl_Interp *interp __unused, +ZnCreateMapInfo(Tcl_Interp *interp __znunused, char *name, ZnMapInfoId *map_info) { @@ -1441,7 +1441,7 @@ LookupMapInfoMaster(Tcl_Interp *interp, } static int -ZnDeleteMapInfo(Tcl_Interp *interp __unused, +ZnDeleteMapInfo(Tcl_Interp *interp __znunused, char *name) { ZnMapInfoMaster *master; @@ -1610,7 +1610,7 @@ ZnMapInfoTextStyleFromString(Tcl_Interp *interp, } int -ZnMapInfoObjCmd(ClientData client_data __unused, +ZnMapInfoObjCmd(ClientData client_data __znunused, Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ Tcl_Obj *CONST args[]) @@ -2089,7 +2089,7 @@ ZnMapInfoObjCmd(ClientData client_data __unused, *---------------------------------------------------------------------- */ int -ZnVideomapObjCmd(ClientData client_data __unused, +ZnVideomapObjCmd(ClientData client_data __znunused, Tcl_Interp *interp, /* Current interpreter. */ int argc, /* Number of arguments. */ Tcl_Obj *CONST args[]) diff --git a/generic/OverlapMan.c b/generic/OverlapMan.c index a57dea9..8e38d39 100644 --- a/generic/OverlapMan.c +++ b/generic/OverlapMan.c @@ -349,7 +349,7 @@ OmRegister(void *w, int *, int *), void (*_fset_label_angle)(void *, void *, int, int), void (*_fquery_label_pos)(void *, void *, int, - int *, int *, int *, int *) __unused) + int *, int *, int *, int *) __znunused) { int iw=0; BOOLEAN found=FALSE; @@ -1061,7 +1061,7 @@ void OmProcessOverlap(void *zinc, int width, int height, - double scale __unused) + double scale __znunused) { double acceleration = 0.0; int ip, iw; diff --git a/generic/PostScript.c b/generic/PostScript.c index 1867ef0..e24164a 100644 --- a/generic/PostScript.c +++ b/generic/PostScript.c @@ -189,9 +189,9 @@ static Tk_ConfigSpec config_specs[] = { *---------------------------------------------------------------------- */ static int -ZnPsDimParse(ClientData client_data __unused, - Tcl_Interp *interp __unused, - Tk_Window tkwin __unused, +ZnPsDimParse(ClientData client_data __znunused, + Tcl_Interp *interp __znunused, + Tk_Window tkwin __znunused, Tcl_Obj *ovalue, char *widget_rec, int offset) @@ -250,12 +250,12 @@ ZnPsDimParse(ClientData client_data __unused, } static Tcl_Obj * -ZnPsDimPrint(ClientData client_data __unused, - Tk_Window tkwin __unused, +ZnPsDimPrint(ClientData client_data __znunused, + Tk_Window tkwin __znunused, char *widget_rec, int offset, #ifdef PTK - Tcl_FreeProc **free_proc __unused + Tcl_FreeProc **free_proc __znunused #else Tcl_FreeProc **free_proc #endif @@ -289,9 +289,9 @@ ZnPsDimPrint(ClientData client_data __unused, *---------------------------------------------------------------------- */ static int -ZnPsColorModeParse(ClientData client_data __unused, - Tcl_Interp *interp __unused, - Tk_Window tkwin __unused, +ZnPsColorModeParse(ClientData client_data __znunused, + Tcl_Interp *interp __znunused, + Tk_Window tkwin __znunused, Tcl_Obj *ovalue, char *widget_rec, int offset) @@ -326,11 +326,11 @@ ZnPsColorModeParse(ClientData client_data __unused, } static Tcl_Obj * -ZnPsColorModePrint(ClientData client_data __unused, - Tk_Window tkwin __unused, +ZnPsColorModePrint(ClientData client_data __znunused, + Tk_Window tkwin __znunused, char *widget_rec, int offset, - Tcl_FreeProc **free_proc __unused) + Tcl_FreeProc **free_proc __znunused) { int *mode = (int *) (widget_rec + offset); char *s; @@ -362,9 +362,9 @@ ZnPsColorModePrint(ClientData client_data __unused, *---------------------------------------------------------------------- */ static int -ZnBBoxParse(ClientData client_data __unused, - Tcl_Interp *interp __unused, - Tk_Window tkwin __unused, +ZnBBoxParse(ClientData client_data __znunused, + Tcl_Interp *interp __znunused, + Tk_Window tkwin __znunused, Tcl_Obj *ovalue, char *widget_rec, int offset) @@ -402,12 +402,12 @@ ZnBBoxParse(ClientData client_data __unused, } static Tcl_Obj * -ZnBBoxPrint(ClientData client_data __unused, - Tk_Window tkwin __unused, +ZnBBoxPrint(ClientData client_data __znunused, + Tk_Window tkwin __znunused, char *widget_rec, int offset, #ifdef PTK - Tcl_FreeProc **free_proc __unused + Tcl_FreeProc **free_proc __znunused #else Tcl_FreeProc **free_proc #endif diff --git a/generic/Rectangle.c b/generic/Rectangle.c index a7ffb81..6ae61c4 100644 --- a/generic/Rectangle.c +++ b/generic/Rectangle.c @@ -287,7 +287,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, rect_attrs, argv[0]) == TCL_ERROR) { @@ -307,7 +307,7 @@ Query(ZnItem item, */ static void ComputeCoordinates(ZnItem item, - ZnBool force __unused) + ZnBool force __znunused) { ZnWInfo *wi = item->wi; RectangleItem rect = (RectangleItem) item; @@ -690,7 +690,7 @@ Render(ZnItem item) } #else static void -Render(ZnItem item __unused) +Render(ZnItem item __znunused) { } #endif @@ -705,7 +705,7 @@ Render(ZnItem item __unused) */ static ZnBool IsSensitive(ZnItem item, - int item_part __unused) + int item_part __znunused) { return (ISSET(item->flags, ZN_SENSITIVE_BIT) && item->parent->class->IsSensitive(item->parent, ZN_NO_PART)); @@ -765,8 +765,8 @@ Pick(ZnItem item, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } @@ -834,11 +834,11 @@ GetClipVertices(ZnItem item, */ static int Coords(ZnItem item, - int contour __unused, + int contour __znunused, int index, int cmd, ZnPoint **pts, - char **controls __unused, + char **controls __znunused, unsigned int *num_pts) { RectangleItem rect = (RectangleItem) item; diff --git a/generic/Reticle.c b/generic/Reticle.c index a8adb90..6bfa235 100644 --- a/generic/Reticle.c +++ b/generic/Reticle.c @@ -137,8 +137,8 @@ static ZnAttrConfig reticle_attrs[] = { */ static int Init(ZnItem item, - int *argc __unused, - Tcl_Obj *CONST *args[] __unused) + int *argc __znunused, + Tcl_Obj *CONST *args[] __znunused) { ReticleItem reticle = (ReticleItem) item; ZnWInfo *wi = item->wi; @@ -234,7 +234,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, reticle_attrs, argv[0]) == TCL_ERROR) { @@ -254,7 +254,7 @@ Query(ZnItem item, */ static void ComputeCoordinates(ZnItem item, - ZnBool force __unused) + ZnBool force __znunused) { ZnWInfo *wi = item->wi; ReticleItem reticle = (ReticleItem) item; @@ -305,8 +305,8 @@ ComputeCoordinates(ZnItem item, ********************************************************************************** */ static int -ToArea(ZnItem item __unused, - ZnToArea ta __unused) +ToArea(ZnItem item __znunused, + ZnToArea ta __znunused) { return -1; } @@ -493,7 +493,7 @@ Render(ZnItem item) } #else static void -Render(ZnItem item __unused) +Render(ZnItem item __znunused) { } #endif @@ -508,7 +508,7 @@ Render(ZnItem item __unused) */ static ZnBool IsSensitive(ZnItem item, - int item_part __unused) + int item_part __znunused) { return (ISSET(item->flags, ZN_SENSITIVE_BIT) && item->parent->class->IsSensitive(item->parent, ZN_NO_PART)); @@ -524,8 +524,8 @@ IsSensitive(ZnItem item, ********************************************************************************** */ static double -Pick(ZnItem item __unused, - ZnPick ps __unused) +Pick(ZnItem item __znunused, + ZnPick ps __znunused) { return 1e40; } @@ -541,11 +541,11 @@ Pick(ZnItem item __unused, */ static int Coords(ZnItem item, - int contour __unused, - int index __unused, + int contour __znunused, + int index __znunused, int cmd, ZnPoint **pts, - char **controls __unused, + char **controls __znunused, unsigned int *num_pts) { ReticleItem reticle = (ReticleItem) item; @@ -580,8 +580,8 @@ Coords(ZnItem item, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } diff --git a/generic/Tabular.c b/generic/Tabular.c index 79fe072..03f9299 100644 --- a/generic/Tabular.c +++ b/generic/Tabular.c @@ -233,7 +233,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, tabular_attrs, argv[0]) == TCL_ERROR) { @@ -253,7 +253,7 @@ Query(ZnItem item, */ static void ComputeCoordinates(ZnItem item, - ZnBool force __unused) + ZnBool force __znunused) { TabularItem tab = (TabularItem) item; ZnWInfo *wi = item->wi; @@ -411,8 +411,8 @@ Pick(ZnItem item, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } @@ -499,11 +499,11 @@ GetClipVertices(ZnItem item, */ static int Coords(ZnItem item, - int contour __unused, - int index __unused, + int contour __znunused, + int index __znunused, int cmd, ZnPoint **pts, - char **controls __unused, + char **controls __znunused, unsigned int *num_pts) { TabularItem tabular = (TabularItem) item; diff --git a/generic/Text.c b/generic/Text.c index 0ab886b..753962c 100644 --- a/generic/Text.c +++ b/generic/Text.c @@ -171,8 +171,8 @@ static ZnAttrConfig text_attrs[] = { */ static int Init(ZnItem item, - int *argc __unused, - Tcl_Obj *CONST *args[] __unused) + int *argc __znunused, + Tcl_Obj *CONST *args[] __znunused) { ZnWInfo *wi = item->wi; TextItem text = (TextItem) item; @@ -373,7 +373,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, text_attrs, argv[0]) == TCL_ERROR) { @@ -543,7 +543,7 @@ ComputeSelection(ZnItem item, */ static void ComputeCoordinates(ZnItem item, - ZnBool force __unused) + ZnBool force __znunused) { ZnWInfo *wi = item->wi; TextItem text = (TextItem) item; @@ -1280,7 +1280,7 @@ Render(ZnItem item) } #else static void -Render(ZnItem item __unused) +Render(ZnItem item __znunused) { } #endif @@ -1295,7 +1295,7 @@ Render(ZnItem item __unused) */ static ZnBool IsSensitive(ZnItem item, - int item_part __unused) + int item_part __znunused) { return (ISSET(item->flags, ZN_SENSITIVE_BIT) && item->parent->class->IsSensitive(item->parent, ZN_NO_PART)); @@ -1366,8 +1366,8 @@ Pick(ZnItem item, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } @@ -1428,11 +1428,11 @@ GetClipVertices(ZnItem item, */ static int Coords(ZnItem item, - int contour __unused, - int index __unused, + int contour __znunused, + int index __znunused, int cmd, ZnPoint **pts, - char **controls __unused, + char **controls __znunused, unsigned int *num_pts) { TextItem text = (TextItem) item; @@ -1642,7 +1642,7 @@ MoveFromIndex(TextItem text, static int Index(ZnItem item, - int field __unused, + int field __znunused, Tcl_Obj *index_spec, int *index) { @@ -1748,7 +1748,7 @@ Index(ZnItem item, */ static void InsertChars(ZnItem item, - int field __unused, + int field __znunused, int *index, char *chars) { @@ -1812,7 +1812,7 @@ InsertChars(ZnItem item, */ static void DeleteChars(ZnItem item, - int field __unused, + int field __znunused, int *first, int *last) { @@ -1900,7 +1900,7 @@ DeleteChars(ZnItem item, */ static void TextCursor(ZnItem item, - int field __unused, + int field __znunused, int index) { TextItem text = (TextItem) item; @@ -1926,7 +1926,7 @@ TextCursor(ZnItem item, */ static int Selection(ZnItem item, - int field __unused, + int field __znunused, int offset, char *chars, int max_bytes) diff --git a/generic/Track.c b/generic/Track.c index b079f63..1ad4e47 100644 --- a/generic/Track.c +++ b/generic/Track.c @@ -681,7 +681,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, track_attrs, argv[0]) == TCL_ERROR) { @@ -701,7 +701,7 @@ Query(ZnItem item, */ static void ComputeCoordinates(ZnItem item, - ZnBool force __unused) + ZnBool force __znunused) { ZnWInfo *wi = item->wi; TrackItem track = (TrackItem) item; @@ -1595,7 +1595,7 @@ Render(ZnItem item) } #else static void -Render(ZnItem item __unused) +Render(ZnItem item __znunused) { } #endif @@ -1779,8 +1779,8 @@ Pick(ZnItem item, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } @@ -1919,9 +1919,9 @@ ZnSendTrackToOm(void *ptr, ********************************************************************************** */ void -ZnSetLabelAngleFromOm(void *ptr __unused, /* No longer in use. */ +ZnSetLabelAngleFromOm(void *ptr __znunused, /* No longer in use. */ void *item, - int rho __unused, + int rho __znunused, int theta) { TrackItem track = (TrackItem) item; @@ -1951,7 +1951,7 @@ ZnSetLabelAngleFromOm(void *ptr __unused, /* No longer in use. */ ********************************************************************************** */ void -ZnQueryLabelPosition(void *ptr __unused, /* No longer in use. */ +ZnQueryLabelPosition(void *ptr __znunused, /* No longer in use. */ void *item, int theta, int *x, @@ -1999,9 +1999,9 @@ ZnQueryLabelPosition(void *ptr __unused, /* No longer in use. */ ********************************************************************************** */ void -ZnSetHistoryVisibility(ZnItem item __unused, - int index __unused, - ZnBool visible __unused) +ZnSetHistoryVisibility(ZnItem item __znunused, + int index __znunused, + ZnBool visible __znunused) { } @@ -2078,11 +2078,11 @@ GetAnchor(ZnItem item, */ static int Coords(ZnItem item, - int contour __unused, - int index __unused, + int contour __znunused, + int index __znunused, int cmd, ZnPoint **pts, - char **controls __unused, + char **controls __znunused, unsigned int *num_pts) { TrackItem track = (TrackItem) item; diff --git a/generic/Triangles.c b/generic/Triangles.c index d17dc9c..6b5ee77 100644 --- a/generic/Triangles.c +++ b/generic/Triangles.c @@ -248,7 +248,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, tr_attrs, argv[0]) == TCL_ERROR) { @@ -268,7 +268,7 @@ Query(ZnItem item, */ static void ComputeCoordinates(ZnItem item, - ZnBool force __unused) + ZnBool force __znunused) { ZnWInfo *wi = item->wi; TrianglesItem tr = (TrianglesItem) item; @@ -498,7 +498,7 @@ Render(ZnItem item) } #else static void -Render(ZnItem item __unused) +Render(ZnItem item __znunused) { } #endif @@ -513,7 +513,7 @@ Render(ZnItem item __unused) */ static ZnBool IsSensitive(ZnItem item, - int item_part __unused) + int item_part __znunused) { return (ISSET(item->flags, ZN_SENSITIVE_BIT) && item->parent->class->IsSensitive(item->parent, ZN_NO_PART)); @@ -585,8 +585,8 @@ Pick(ZnItem item, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } @@ -678,11 +678,11 @@ GetContours(ZnItem item, */ static int Coords(ZnItem item, - int contour __unused, + int contour __znunused, int index, int cmd, ZnPoint **pts, - char **controls __unused, + char **controls __znunused, unsigned int *num_pts) { TrianglesItem tr = (TrianglesItem) item; diff --git a/generic/Window.c b/generic/Window.c index 2ed8703..f791b81 100644 --- a/generic/Window.c +++ b/generic/Window.c @@ -136,7 +136,7 @@ WindowDeleted(ClientData client_data, */ static void WindowItemRequest(ClientData client_data, - Tk_Window win __unused) + Tk_Window win __znunused) { WindowItem wind = (WindowItem) client_data; @@ -149,7 +149,7 @@ WindowItemRequest(ClientData client_data, */ static void WindowItemLostSlave(ClientData client_data, - Tk_Window win __unused) + Tk_Window win __znunused) { WindowItem wind = (WindowItem) client_data; ZnWInfo *wi = ((ZnItem) wind)->wi; @@ -179,8 +179,8 @@ static Tk_GeomMgr wind_geom_type = { */ static int Init(ZnItem item, - int *argc __unused, - Tcl_Obj *CONST *args[] __unused) + int *argc __znunused, + Tcl_Obj *CONST *args[] __znunused) { WindowItem wind = (WindowItem) item; @@ -322,7 +322,7 @@ Configure(ZnItem item, */ static int Query(ZnItem item, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST argv[]) { if (ZnQueryAttribute(item->wi->interp, item, wind_attrs, argv[0]) == TCL_ERROR) { @@ -342,7 +342,7 @@ Query(ZnItem item, */ static void ComputeCoordinates(ZnItem item, - ZnBool force __unused) + ZnBool force __znunused) { ZnWInfo *wi = item->wi; WindowItem wind = (WindowItem) item; @@ -498,8 +498,8 @@ Draw(ZnItem item) ********************************************************************************** */ static ZnBool -IsSensitive(ZnItem item __unused, - int item_part __unused) +IsSensitive(ZnItem item __znunused, + int item_part __znunused) { /* * Sensitivity can't be controlled. @@ -545,8 +545,8 @@ Pick(ZnItem item, ********************************************************************************** */ static void -PostScript(ZnItem item __unused, - ZnBool prepass __unused) +PostScript(ZnItem item __znunused, + ZnBool prepass __znunused) { } @@ -618,11 +618,11 @@ GetClipVertices(ZnItem item, */ static int Coords(ZnItem item, - int contour __unused, - int index __unused, + int contour __znunused, + int index __znunused, int cmd, ZnPoint **pts, - char **controls __unused, + char **controls __znunused, unsigned int *num_pts) { WindowItem wind = (WindowItem) item; diff --git a/generic/perfos.c b/generic/perfos.c index 3a0847a..aadfb9b 100644 --- a/generic/perfos.c +++ b/generic/perfos.c @@ -50,8 +50,8 @@ static ZnList Chronos = NULL; ********************************************************************************** */ static void -HardwareSynchronize(Display *test_display __unused, - Drawable test_window __unused) +HardwareSynchronize(Display *test_display __znunused, + Drawable test_window __znunused) { /*XImage *image;*/ diff --git a/generic/private.h b/generic/private.h index 015be37..94a58ca 100644 --- a/generic/private.h +++ b/generic/private.h @@ -87,7 +87,7 @@ #define __constructor __attribute__ ((__constructor__)) #define __destructor __attribute__ ((__destructor__)) #define __noreturn __attribute__ ((__noreturn__)) -#define __unused __attribute__ ((__unused__)) +#define __znunused __attribute__ ((__unused__)) #ifndef __GNUC__ diff --git a/generic/tkZinc.c b/generic/tkZinc.c index a5af97d..3f84441 100644 --- a/generic/tkZinc.c +++ b/generic/tkZinc.c @@ -547,9 +547,9 @@ static void Repair _ANSI_ARGS_((ZnWInfo *wi)); *---------------------------------------------------------------------- */ static int -ZnReliefParse(ClientData client_data __unused, - Tcl_Interp *interp __unused, - Tk_Window tkwin __unused, +ZnReliefParse(ClientData client_data __znunused, + Tcl_Interp *interp __znunused, + Tk_Window tkwin __znunused, Tcl_Obj *ovalue, char *widget_rec, int offset) @@ -569,11 +569,11 @@ ZnReliefParse(ClientData client_data __unused, } static Tcl_Obj * -ZnReliefPrint(ClientData client_data __unused, - Tk_Window tkwin __unused, +ZnReliefPrint(ClientData client_data __znunused, + Tk_Window tkwin __znunused, char *widget_rec, int offset, - Tcl_FreeProc **free_proc __unused) + Tcl_FreeProc **free_proc __znunused) { ZnReliefStyle relief = *(ZnReliefStyle *) (widget_rec + offset); return Tcl_NewStringObj(ZnNameOfRelief(relief), -1); @@ -590,7 +590,7 @@ ZnReliefPrint(ClientData client_data __unused, *---------------------------------------------------------------------- */ static int -ZnGradientParse(ClientData client_data __unused, +ZnGradientParse(ClientData client_data __znunused, Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *ovalue, @@ -616,11 +616,11 @@ ZnGradientParse(ClientData client_data __unused, } static Tcl_Obj * -ZnGradientPrint(ClientData client_data __unused, - Tk_Window tkwin __unused, +ZnGradientPrint(ClientData client_data __znunused, + Tk_Window tkwin __znunused, char *widget_rec, int offset, - Tcl_FreeProc **free_proc __unused) + Tcl_FreeProc **free_proc __znunused) { ZnGradient *gradient = *(ZnGradient **) (widget_rec + offset); return Tcl_NewStringObj(ZnNameOfGradient(gradient), -1); @@ -638,9 +638,9 @@ ZnGradientPrint(ClientData client_data __unused, *---------------------------------------------------------------------- */ static int -ZnBitmapParse(ClientData client_data __unused, - Tcl_Interp *interp __unused, - Tk_Window tkwin __unused, +ZnBitmapParse(ClientData client_data __znunused, + Tcl_Interp *interp __znunused, + Tk_Window tkwin __znunused, Tcl_Obj *ovalue, char *widget_rec, int offset) @@ -683,9 +683,9 @@ ZnImageUpdate(void *client_data) } static int -ZnImageParse(ClientData client_data __unused, - Tcl_Interp *interp __unused, - Tk_Window tkwin __unused, +ZnImageParse(ClientData client_data __znunused, + Tcl_Interp *interp __znunused, + Tk_Window tkwin __znunused, Tcl_Obj *ovalue, char *widget_rec, int offset) @@ -714,11 +714,11 @@ ZnImageParse(ClientData client_data __unused, } static Tcl_Obj * -ZnImagePrint(ClientData client_data __unused, - Tk_Window tkwin __unused, +ZnImagePrint(ClientData client_data __znunused, + Tk_Window tkwin __znunused, char *widget_rec, int offset, - Tcl_FreeProc **free_proc __unused) + Tcl_FreeProc **free_proc __znunused) { ZnImage image = *(ZnImage *) (widget_rec + offset); return Tcl_NewStringObj(image?ZnNameOfImage(image):"", -1); @@ -735,14 +735,14 @@ ZnImagePrint(ClientData client_data __unused, *---------------------------------------------------------------------- */ static int -ZnSetReliefOpt(ClientData client_data __unused, - Tcl_Interp *interp __unused, - Tk_Window tkwin __unused, +ZnSetReliefOpt(ClientData client_data __znunused, + Tcl_Interp *interp __znunused, + Tk_Window tkwin __znunused, Tcl_Obj **ovalue, char *widget_rec, int offset, char *old_val_ptr, - int flags __unused) + int flags __znunused) { ZnReliefStyle *relief_ptr; ZnReliefStyle relief; @@ -760,8 +760,8 @@ ZnSetReliefOpt(ClientData client_data __unused, } static Tcl_Obj * -ZnGetReliefOpt(ClientData client_data __unused, - Tk_Window tkwin __unused, +ZnGetReliefOpt(ClientData client_data __znunused, + Tk_Window tkwin __znunused, char *widget_rec, int offset) { @@ -770,8 +770,8 @@ ZnGetReliefOpt(ClientData client_data __unused, } static void -ZnRestoreReliefOpt(ClientData client_data __unused, - Tk_Window tkwin __unused, +ZnRestoreReliefOpt(ClientData client_data __znunused, + Tk_Window tkwin __znunused, char *val_ptr, char *old_val_ptr) { @@ -789,14 +789,14 @@ ZnRestoreReliefOpt(ClientData client_data __unused, *---------------------------------------------------------------------- */ static int -ZnSetGradientOpt(ClientData client_data __unused, +ZnSetGradientOpt(ClientData client_data __znunused, Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj **ovalue, char *widget_rec, int offset, char *old_val_ptr, - int flags __unused) + int flags __znunused) { ZnGradient **grad_ptr; ZnGradient *grad; @@ -820,8 +820,8 @@ ZnSetGradientOpt(ClientData client_data __unused, } static Tcl_Obj * -ZnGetGradientOpt(ClientData client_data __unused, - Tk_Window tkwin __unused, +ZnGetGradientOpt(ClientData client_data __znunused, + Tk_Window tkwin __znunused, char *widget_rec, int offset) { @@ -830,8 +830,8 @@ ZnGetGradientOpt(ClientData client_data __unused, } static void -ZnRestoreGradientOpt(ClientData client_data __unused, - Tk_Window tkwin __unused, +ZnRestoreGradientOpt(ClientData client_data __znunused, + Tk_Window tkwin __znunused, char *val_ptr, char *old_val_ptr) { @@ -842,8 +842,8 @@ ZnRestoreGradientOpt(ClientData client_data __unused, } static void -ZnFreeGradientOpt(ClientData client_data __unused, - Tk_Window tkwin __unused, +ZnFreeGradientOpt(ClientData client_data __znunused, + Tk_Window tkwin __znunused, char *val_ptr) { if (*(ZnGradient **) val_ptr != NULL) { @@ -2593,7 +2593,7 @@ ZnItemWithTagOrId(ZnWInfo *wi, */ static int LayoutItems(ZnWInfo *wi, - int argc __unused, + int argc __znunused, Tcl_Obj *CONST args[]) { int index/*, result*/; @@ -8838,10 +8838,10 @@ ZnTessEnd(void *data) static void ZnTessCombine(GLdouble coords[3], - void *vertex_data[4] __unused, - GLfloat weight[4] __unused, + void *vertex_data[4] __znunused, + GLfloat weight[4] __znunused, void **out_data, - void *data __unused) + void *data __znunused) { ZnCombineData *cdata; @@ -8858,7 +8858,7 @@ ZnTessCombine(GLdouble coords[3], static void ZnTessError(GLenum errno, - void *data __unused) + void *data __znunused) { fprintf(stderr, "Tesselation error in curve item: %d\n", errno); } @@ -9060,9 +9060,9 @@ Tkzinc_debug_Init(Tcl_Interp *interp) /* Used for error reporting. */ *---------------------------------------------------------------------- */ BOOL APIENTRY -DllEntryPoint(HINSTANCE hInst __unused, /* Library instance handle. */ - DWORD reason __unused, /* Reason this function is being called. */ - LPVOID reserved __unused) /* Not used. */ +DllEntryPoint(HINSTANCE hInst __znunused, /* Library instance handle. */ + DWORD reason __znunused, /* Reason this function is being called. */ + LPVOID reserved __znunused) /* Not used. */ { return TRUE; } -- cgit v1.1