[packages/mirrormagic.git] / mirrormagic-va_arg.patch

diff -uNr mirrormagic-2.0.1.orig/src/libgame/gadgets.c mirrormagic-2.0.1/src/libgame/gadgets.c
--- mirrormagic-2.0.1.orig/src/libgame/gadgets.c	Sun Jan 14 17:12:08 2001
+++ mirrormagic-2.0.1/src/libgame/gadgets.c	Sat Aug 10 19:01:36 2002
@@ -279,7 +279,7 @@
 	{
 	  int max_textsize = MAX_INFO_TEXTSIZE - 1;
 
-	  strncpy(gi->info_text, va_arg(ap, char *), max_textsize);
+	  strncpy(gi->info_text, (char *) va_arg(ap, int), max_textsize);
 	  gi->info_text[max_textsize] = '\0';
 	}
 	break;
@@ -301,29 +301,29 @@
 	break;
 
       case GDI_TYPE:
-	gi->type = va_arg(ap, unsigned long);
+	gi->type = (unsigned long) va_arg(ap, int);
 	break;
 
       case GDI_STATE:
-	gi->state = va_arg(ap, unsigned long);
+	gi->state = (unsigned long) va_arg(ap, int);
 	break;
 
       case GDI_CHECKED:
-	gi->checked = va_arg(ap, boolean);
+	gi->checked = (boolean) va_arg(ap, int);
 	break;
 
       case GDI_RADIO_NR:
-	gi->radio_nr = va_arg(ap, unsigned long);
+	gi->radio_nr = (unsigned long) va_arg(ap, int);
 	break;
 
       case GDI_NUMBER_VALUE:
-	gi->text.number_value = va_arg(ap, long);
+	gi->text.number_value = (long) va_arg(ap, int);
 	sprintf(gi->text.value, "%d", gi->text.number_value);
 	gi->text.cursor_position = strlen(gi->text.value);
 	break;
 
       case GDI_NUMBER_MIN:
-	gi->text.number_min = va_arg(ap, long);
+	gi->text.number_min = (long) va_arg(ap, int);
 	if (gi->text.number_value < gi->text.number_min)
 	{
 	  gi->text.number_value = gi->text.number_min;
@@ -332,7 +332,7 @@
 	break;
 
       case GDI_NUMBER_MAX:
-	gi->text.number_max = va_arg(ap, long);
+	gi->text.number_max = (long) va_arg(ap, int);
 	if (gi->text.number_value > gi->text.number_max)
 	{
 	  gi->text.number_value = gi->text.number_max;
@@ -347,7 +347,7 @@
 	  if (gi->text.size)
 	    max_textsize = MIN(gi->text.size, MAX_GADGET_TEXTSIZE - 1);
 
-	  strncpy(gi->text.value, va_arg(ap, char *), max_textsize);
+	  strncpy(gi->text.value, (char *) va_arg(ap, int), max_textsize);
 	  gi->text.value[max_textsize] = '\0';
 	  gi->text.cursor_position = strlen(gi->text.value);
 	}
@@ -368,25 +368,25 @@
 	break;
 
       case GDI_DESIGN_UNPRESSED:
-	gi->design[GD_BUTTON_UNPRESSED].bitmap = va_arg(ap, Bitmap *);
+	gi->design[GD_BUTTON_UNPRESSED].bitmap = (Bitmap *) va_arg(ap, int);
 	gi->design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
 	gi->design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
 	break;
 
       case GDI_DESIGN_PRESSED:
-	gi->design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap *);
+	gi->design[GD_BUTTON_PRESSED].bitmap = (Bitmap *) va_arg(ap, int);
 	gi->design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
 	gi->design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
 	break;
 
       case GDI_ALT_DESIGN_UNPRESSED:
-	gi->alt_design[GD_BUTTON_UNPRESSED].bitmap= va_arg(ap, Bitmap *);
+	gi->alt_design[GD_BUTTON_UNPRESSED].bitmap= (Bitmap *) va_arg(ap, int);
 	gi->alt_design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
 	gi->alt_design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
 	break;
 
       case GDI_ALT_DESIGN_PRESSED:
-	gi->alt_design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap *);
+	gi->alt_design[GD_BUTTON_PRESSED].bitmap = (Bitmap *) va_arg(ap, int);
 	gi->alt_design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
 	gi->alt_design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
 	break;
@@ -400,7 +400,7 @@
 	break;
 
       case GDI_DECORATION_DESIGN:
-	gi->deco.design.bitmap = va_arg(ap, Bitmap *);
+	gi->deco.design.bitmap = (Bitmap *) va_arg(ap, int);
 	gi->deco.design.x = va_arg(ap, int);
 	gi->deco.design.y = va_arg(ap, int);
 	break;
@@ -421,7 +421,7 @@
 	break;
 
       case GDI_EVENT_MASK:
-	gi->event_mask = va_arg(ap, unsigned long);
+	gi->event_mask = (unsigned long) va_arg(ap, int);
 	break;
 
       case GDI_AREA_SIZE:
@@ -475,11 +475,11 @@
 	break;
 
       case GDI_CALLBACK_INFO:
-	gi->callback_info = va_arg(ap, gadget_function);
+	gi->callback_info = (gadget_function) va_arg(ap, int);
 	break;
 
       case GDI_CALLBACK_ACTION:
-	gi->callback_action = va_arg(ap, gadget_function);
+	gi->callback_action = (gadget_function) va_arg(ap, int);
 	break;
 
       default:
Commit	Line	Data
55ee01ab	1	diff -uNr mirrormagic-2.0.1.orig/src/libgame/gadgets.c mirrormagic-2.0.1/src/libgame/gadgets.c
	2	--- mirrormagic-2.0.1.orig/src/libgame/gadgets.c Sun Jan 14 17:12:08 2001
	3	+++ mirrormagic-2.0.1/src/libgame/gadgets.c Sat Aug 10 19:01:36 2002
	4	@@ -279,7 +279,7 @@
	5	{
	6	int max_textsize = MAX_INFO_TEXTSIZE - 1;
	7
	8	- strncpy(gi->info_text, va_arg(ap, char *), max_textsize);
	9	+ strncpy(gi->info_text, (char *) va_arg(ap, int), max_textsize);
	10	gi->info_text[max_textsize] = '\0';
	11	}
	12	break;
	13	@@ -301,29 +301,29 @@
	14	break;
	15
	16	case GDI_TYPE:
	17	- gi->type = va_arg(ap, unsigned long);
	18	+ gi->type = (unsigned long) va_arg(ap, int);
	19	break;
	20
	21	case GDI_STATE:
	22	- gi->state = va_arg(ap, unsigned long);
	23	+ gi->state = (unsigned long) va_arg(ap, int);
	24	break;
	25
	26	case GDI_CHECKED:
	27	- gi->checked = va_arg(ap, boolean);
	28	+ gi->checked = (boolean) va_arg(ap, int);
	29	break;
	30
	31	case GDI_RADIO_NR:
	32	- gi->radio_nr = va_arg(ap, unsigned long);
	33	+ gi->radio_nr = (unsigned long) va_arg(ap, int);
	34	break;
	35
	36	case GDI_NUMBER_VALUE:
	37	- gi->text.number_value = va_arg(ap, long);
	38	+ gi->text.number_value = (long) va_arg(ap, int);
	39	sprintf(gi->text.value, "%d", gi->text.number_value);
	40	gi->text.cursor_position = strlen(gi->text.value);
	41	break;
	42
	43	case GDI_NUMBER_MIN:
	44	- gi->text.number_min = va_arg(ap, long);
	45	+ gi->text.number_min = (long) va_arg(ap, int);
	46	if (gi->text.number_value < gi->text.number_min)
	47	{
	48	gi->text.number_value = gi->text.number_min;
	49	@@ -332,7 +332,7 @@
	50	break;
	51
	52	case GDI_NUMBER_MAX:
	53	- gi->text.number_max = va_arg(ap, long);
	54	+ gi->text.number_max = (long) va_arg(ap, int);
	55	if (gi->text.number_value > gi->text.number_max)
	56	{
	57	gi->text.number_value = gi->text.number_max;
	58	@@ -347,7 +347,7 @@
	59	if (gi->text.size)
	60	max_textsize = MIN(gi->text.size, MAX_GADGET_TEXTSIZE - 1);
	61
	62	- strncpy(gi->text.value, va_arg(ap, char *), max_textsize);
	63	+ strncpy(gi->text.value, (char *) va_arg(ap, int), max_textsize);
	64	gi->text.value[max_textsize] = '\0';
65	gi->text.cursor_position = strlen(gi->text.value);
66	}
67	@@ -368,25 +368,25 @@
68	break;
69
70	case GDI_DESIGN_UNPRESSED:
71	- gi->design[GD_BUTTON_UNPRESSED].bitmap = va_arg(ap, Bitmap *);
72	+ gi->design[GD_BUTTON_UNPRESSED].bitmap = (Bitmap *) va_arg(ap, int);
73	gi->design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
74	gi->design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
75	break;
76
77	case GDI_DESIGN_PRESSED:
78	- gi->design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap *);
79	+ gi->design[GD_BUTTON_PRESSED].bitmap = (Bitmap *) va_arg(ap, int);
80	gi->design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
81	gi->design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
82	break;
83
84	case GDI_ALT_DESIGN_UNPRESSED:
85	- gi->alt_design[GD_BUTTON_UNPRESSED].bitmap= va_arg(ap, Bitmap *);
86	+ gi->alt_design[GD_BUTTON_UNPRESSED].bitmap= (Bitmap *) va_arg(ap, int);
87	gi->alt_design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
88	gi->alt_design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
89	break;
90
91	case GDI_ALT_DESIGN_PRESSED:
92	- gi->alt_design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap *);
93	+ gi->alt_design[GD_BUTTON_PRESSED].bitmap = (Bitmap *) va_arg(ap, int);
94	gi->alt_design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
95	gi->alt_design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
96	break;
97	@@ -400,7 +400,7 @@
98	break;
99
100	case GDI_DECORATION_DESIGN:
101	- gi->deco.design.bitmap = va_arg(ap, Bitmap *);
102	+ gi->deco.design.bitmap = (Bitmap *) va_arg(ap, int);
103	gi->deco.design.x = va_arg(ap, int);
104	gi->deco.design.y = va_arg(ap, int);
105	break;
106	@@ -421,7 +421,7 @@
107	break;
108
109	case GDI_EVENT_MASK:
110	- gi->event_mask = va_arg(ap, unsigned long);
111	+ gi->event_mask = (unsigned long) va_arg(ap, int);
112	break;
113
114	case GDI_AREA_SIZE:
115	@@ -475,11 +475,11 @@
116	break;
117
118	case GDI_CALLBACK_INFO:
119	- gi->callback_info = va_arg(ap, gadget_function);
120	+ gi->callback_info = (gadget_function) va_arg(ap, int);
121	break;
122
123	case GDI_CALLBACK_ACTION:
124	- gi->callback_action = va_arg(ap, gadget_function);
125	+ gi->callback_action = (gadget_function) va_arg(ap, int);
126	break;
127
128	default: