Package: xzip / 1:1.8.2-4

remove_conflicting_function_names Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
strchr() is never used, remove its redefinition
remainder() is now in the standard library, prefix ours with z_

Index: xzip-1.8.2/interpre.c
===================================================================
--- xzip-1.8.2.orig/interpre.c	1998-07-11 17:25:07.000000000 -0500
+++ xzip-1.8.2/interpre.c	2014-06-03 23:44:21.320264935 -0500
@@ -118,7 +118,7 @@
                     case 0x15: subtract (operand[0], operand[1]); break;
                     case 0x16: multiply (operand[0], operand[1]); break;
                     case 0x17: divide (operand[0], operand[1]); break;
-                    case 0x18: remainder (operand[0], operand[1]); break;
+                    case 0x18: z_remainder (operand[0], operand[1]); break;
                     case 0x19: call (count, operand, FUNCTION); break;
                     case 0x1a: call (count, operand, PROCEDURE); break;
                     case 0x1b: set_colour_attribute (operand[0], operand[1]); break;
Index: xzip-1.8.2/math.c
===================================================================
--- xzip-1.8.2.orig/math.c	2000-10-18 22:26:22.000000000 -0500
+++ xzip-1.8.2/math.c	2014-06-03 23:44:04.680264549 -0500
@@ -104,9 +104,9 @@
  */
 
 #ifdef __STDC__
-void remainder (zword_t a, zword_t b)
+void z_remainder (zword_t a, zword_t b)
 #else
-void remainder (a, b)
+void z_remainder (a, b)
 zword_t a, b;
 #endif
 {
Index: xzip-1.8.2/ztypes.h
===================================================================
--- xzip-1.8.2.orig/ztypes.h	2014-06-03 23:42:07.592261832 -0500
+++ xzip-1.8.2/ztypes.h	2014-06-03 23:44:45.756265502 -0500
@@ -110,7 +110,6 @@
 
 #ifdef unix
 
-#define strchr(a, b) index (a, b)
 #define memmove(a, b, c) bcopy (b, a, c)
 
 #define const
@@ -570,7 +569,7 @@
 void not (zword_t);
 void or (zword_t, zword_t);
 void ziprandom (zword_t);
-void remainder (zword_t, zword_t);
+void z_remainder (zword_t, zword_t);
 void shift (zword_t, zword_t);
 void subtract (zword_t, zword_t);
 void test (zword_t, zword_t);
@@ -587,7 +586,7 @@
 void not ();
 void or ();
 void ziprandom ();
-void remainder ();
+void z_remainder ();
 void shift ();
 void subtract ();
 void test ();