Re: [AD] xor problem with Red Hat's 7.0 compiler and 3.9.33

[Michael Bukin <M.A.Bukin@xxxxxxxxxx>]

Ole Laursen <olau@xxxxxxxxxx> writes:

> > The best solution would be renaming `xor' to `xor_val' or something
> > similar.
> 
> However, the conflict only exists in the headers and since the
> variable names aren't needed in the declaration of a function, simple
> deleting the name would suffice as I suggested.

I've changed it in CVS.  Diff file is attached.


diff -u -r1.16 -r1.17
--- allegro/docs/allegro._tx	2000/10/09 13:44:47	1.16
+++ allegro/docs/allegro._tx	2000/10/19 02:19:21	1.17
@@ -3561,10 +3561,12 @@
    drawing is very slow if you draw directly to video RAM, so wherever 
    possible you should use a memory bitmap instead.
 
-@domain.hid @xor_mode(int xor);
+@@void @xor_mode(int on);
 @xref drawing_mode
    This is a shortcut for toggling xor drawing mode on and off. Calling 
-   xor_mode(TRUE) is equivalent to drawing_mode(DRAW_MODE_XOR, NULL, 0, 0);
+   xor_mode(TRUE) is equivalent to drawing_mode(DRAW_MODE_XOR, NULL, 0, 0); 
+   Calling xor_mode(FALSE) is equivalent to 
+   drawing_mode(DRAW_MODE_SOLID, NULL, 0, 0);
 
 @@void @solid_mode();
 @xref drawing_mode
diff -u -r1.15 -r1.16
--- allegro/include/allegro.h	2000/09/26 14:55:32	1.15
+++ allegro/include/allegro.h	2000/10/19 02:19:21	1.16
@@ -1233,7 +1233,7 @@
 #define DRAW_MODE_TRANS             5
 
 AL_FUNC(void, drawing_mode, (int mode, BITMAP *pattern, int x_anchor, int y_anchor));
-AL_FUNC(void, xor_mode, (int xor));
+AL_FUNC(void, xor_mode, (int on));
 AL_FUNC(void, solid_mode, (void));
 AL_FUNC(void, do_line, (BITMAP *bmp, int x1, int y1, int x2, int y2, int d, AL_METHOD(void, proc, (BITMAP *, int, int, int))));
 AL_FUNC(void, triangle, (BITMAP *bmp, int x1, int y1, int x2, int y2, int x3, int y3, int color));
diff -u -r1.3 -r1.4
--- allegro/src/gfx.c	2000/09/26 08:57:54	1.3
+++ allegro/src/gfx.c	2000/10/19 02:19:21	1.4
@@ -133,9 +133,9 @@
 /* xor_mode:
  *  Shortcut function for toggling XOR mode on and off.
  */
-void xor_mode(int xor)
+void xor_mode(int on)
 {
-   drawing_mode(xor ? DRAW_MODE_XOR : DRAW_MODE_SOLID, NULL, 0, 0);
+   drawing_mode(on ? DRAW_MODE_XOR : DRAW_MODE_SOLID, NULL, 0, 0);
 }
 
 

-- 
Michael Bukin