File pcb-1.6.3-ia64.patch of Package pcb
--- src/control.c
+++ src/control.c
@@ -167,7 +167,7 @@
DrawingLayerMenuEntries[i].Name = name[i];
DrawingLayerMenuEntries[i].Label = name[i];
DrawingLayerMenuEntries[i].Callback = CB_SetDrawingLayer;
- DrawingLayerMenuEntries[i].ClientData = (XtPointer) i;
+ DrawingLayerMenuEntries[i].ClientData = (XtPointer) (long)i;
}
/* init routine exits on NULL pointer */
@@ -243,7 +243,7 @@
LAYOUT_TOP,
NULL);
last = OnOffWidgets[i];
- XtAddCallback(last, XtNcallback, CB_SetOnOff, (XtPointer) i);
+ XtAddCallback(last, XtNcallback, CB_SetOnOff, (XtPointer) (long)i);
}
}
@@ -392,7 +392,7 @@
static void CB_SetDrawingLayer(Widget W,
XtPointer ClientData, XtPointer CallData)
{
- ChangeGroupVisibility((int) ClientData, True, True);
+ ChangeGroupVisibility((long) ClientData, True, True);
XtVaSetValues(DrawingLayerMenuButton.W,
XtNlabel, UNKNOWN(CURRENT->Name),
XtNbackground, CURRENT->Color,
@@ -406,7 +406,7 @@
static void CB_SetOnOff(Widget W, XtPointer ClientData, XtPointer CallData)
{
Boolean state;
- int layer = (int) ClientData;
+ int layer = (int)(long) ClientData;
/* get new state of widget */
XtVaGetValues(W, XtNstate, &state, NULL);
--- src/crosshair.c
+++ src/crosshair.c
@@ -820,7 +820,7 @@
memset(&Crosshair, 0, sizeof(CrosshairType));
Crosshair.GC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL);
- if (!VALID_GC((int) Crosshair.GC))
+ if (!VALID_GC(Crosshair.GC))
MyFatal("can't create default crosshair GC\n");
XSetState(Dpy, Crosshair.GC, Settings.CrosshairColor, Settings.bgColor,
GXxor, AllPlanes);
--- src/dialog.c
+++ src/dialog.c
@@ -71,7 +71,7 @@
*/
static void CB_OK(Widget W, XtPointer ClientData, XtPointer CallData)
{
- ReturnCode = (int) ClientData;
+ ReturnCode = (int)(long) ClientData;
}
/* ---------------------------------------------------------------------------
--- src/fileselect.c
+++ src/fileselect.c
@@ -138,7 +138,7 @@
*/
static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData)
{
- ReturnCode = (int) ClientData;
+ ReturnCode = (int)(long) ClientData;
}
/* ---------------------------------------------------------------------------
--- src/lgdialog.c
+++ src/lgdialog.c
@@ -65,7 +65,7 @@
*/
static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData)
{
- ReturnCode = (int) ClientData;
+ ReturnCode = (int)(long) ClientData;
}
/* ---------------------------------------------------------------------------
@@ -188,7 +188,7 @@
radioGroup[layer] = lastInRow;
XtVaSetValues(lastInRow,
XtNradioGroup, radioGroup[layer],
- XtNradioData, (XtPointer) (i+1),
+ XtNradioData, (XtPointer)(long) (i+1),
NULL);
XtOverrideTranslations(lastInRow, translationtable);
}
@@ -206,7 +206,7 @@
for (group = 0; group < MAX_LAYER; group++)
for (i = 0; i < LayerGroups.Number[group]; i++)
XawToggleSetCurrent(radioGroup[LayerGroups.Entries[group][i]],
- (XtPointer) (group+1));
+ (XtPointer)(long) (group+1));
/* now display dialog window */
StartDialog(popup);
@@ -223,7 +223,7 @@
LayerGroups.Number[group] = 0;
for (i = 0; i < MAX_LAYER+2; i++)
{
- if ((group = (int) XawToggleGetCurrent(radioGroup[i])) != 0)
+ if ((group = (int)(long) XawToggleGetCurrent(radioGroup[i])) != 0)
{
group--;
LayerGroups.Entries[group][LayerGroups.Number[group]++] = i;
--- src/macro.h
+++ src/macro.h
@@ -130,12 +130,7 @@
(p) != BadAlloc && \
(p) != BadDrawable)
-#define VALID_GC(p) ((p) != BadValue && \
- (p) != BadAlloc && \
- (p) != BadDrawable && \
- (p) != BadFont && \
- (p) != BadMatch && \
- (p) != BadPixmap)
+#define VALID_GC(p) ((p) != 0)
/* ---------------------------------------------------------------------------
* Determines if text is actually visible
--- src/main.c
+++ src/main.c
@@ -787,9 +787,9 @@
Output.fgGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL);
Output.bgGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL);
Output.GridGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL);
- if (!VALID_GC((int) Output.fgGC) ||
- !VALID_GC((int) Output.bgGC) ||
- !VALID_GC((int) Output.GridGC))
+ if (!VALID_GC(Output.fgGC) ||
+ !VALID_GC(Output.bgGC) ||
+ !VALID_GC(Output.GridGC))
MyFatal("can't create default GC\n");
XSetForeground(Dpy, Output.bgGC, Settings.bgColor);
--- src/move.c
+++ src/move.c
@@ -359,7 +359,7 @@
DrawArc(Layer, Arc, 0);
Draw();
}
- if (((int) Dest == -1) || Dest == Layer)
+ if ((Dest == (void *) -1) || Dest == Layer)
return(Arc);
AddObjectToMoveToLayerUndoList(ARC_TYPE, Layer, Arc, Arc);
if (Layer->On)
@@ -391,7 +391,7 @@
DrawLine(Layer, Line, 0);
Draw();
}
- if (((int) Dest == -1) || Dest == Layer)
+ if ((Dest == (void *) -1) || Dest == Layer)
return(Line);
AddObjectToMoveToLayerUndoList(LINE_TYPE, Layer, Line, Line);
@@ -473,7 +473,7 @@
TextTypePtr new;
/* Dest == -1 means move to silkscreen layer */
- if (((int) Dest == -1) || (Dest == Layer))
+ if ((Dest == (void *) -1) || (Dest == Layer))
AddObjectToFlagUndoList(TEXT_TYPE, Layer, Text, Text);
else
AddObjectToMoveToLayerUndoList(TEXT_TYPE, Layer, Text, Text);
@@ -481,7 +481,7 @@
(TEST_FLAG(ONSILKFLAG, Text) && (PCB->InvisibleObjectsOn ||
(TEST_FLAG(ONSOLDERFLAG, Text) !=0) == SWAP_IDENT)))
EraseText(Text);
- if ((int) Dest == -1)
+ if (Dest == (void *) -1)
{
SET_FLAG(ONSILKFLAG, Text);
if (PCB->ElementOn || (TEST_FLAG(ONSOLDERFLAG, Text) !=0) == SWAP_IDENT)
@@ -536,7 +536,7 @@
PolygonTypePtr new;
int LayerThermFlag, DestThermFlag;
- if (((int) Dest == -1) || (Layer == Dest))
+ if ((Dest == (void *) -1) || (Layer == Dest))
return(Polygon);
AddObjectToMoveToLayerUndoList(POLYGON_TYPE, Layer, Polygon, Polygon);
if (Layer->On)
--- src/printdialog.c
+++ src/printdialog.c
@@ -218,7 +218,7 @@
*/
static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData)
{
- ReturnCode = (int) ClientData;
+ ReturnCode = (int)(long) ClientData;
}
/* ---------------------------------------------------------------------------
@@ -240,7 +240,7 @@
static void CB_ScrollProc(Widget W, XtPointer ClientData, XtPointer CallData)
{
float top;
- int delta = (int) CallData;
+ int delta = (int)(long) CallData;
/* get thumb postion */
XtVaGetValues(W, XtNtopOfThumb, &top, NULL);
--- src/report.c
+++ src/report.c
@@ -61,7 +61,7 @@
*/
static void CB_OK(Widget W, XtPointer ClientData, XtPointer CallData)
{
- ReturnCode = (int) ClientData;
+ ReturnCode = (int)(long) ClientData;
}
void ReportDrills(void)
--- src/sizedialog.c
+++ src/sizedialog.c
@@ -180,7 +180,7 @@
*/
static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData)
{
- ReturnCode = (int) ClientData;
+ ReturnCode = (int)(long) ClientData;
}
/* ---------------------------------------------------------------------------
@@ -190,7 +190,7 @@
*/
static void CB_ScrollProc(Widget W, XtPointer ClientData, XtPointer CallData)
{
- int delta = (int) CallData;
+ int delta = (int)(long) CallData;
SliderTypePtr slider = (SliderTypePtr) ClientData;
UpdateScrollbar(slider,
