[Commit] Xr/src Xr.h,1.20,1.21 xr.c,1.19,1.20

[commit@keithp.com]

Committed by: cworth

Update of /local/src/CVS/Xr/src
In directory home.keithp.com:/tmp/cvs-serv19997/src

Modified Files:
	Xr.h xr.c 
Log Message:
extern "C" stuff to support C++ (Fredrik Höglund)

Index: Xr.h
===================================================================
RCS file: /local/src/CVS/Xr/src/Xr.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Xr.h	17 Apr 2003 20:24:29 -0000	1.20
+++ Xr.h	23 Apr 2003 14:20:00 -0000	1.21
@@ -31,6 +31,8 @@
 typedef struct _XrState XrState;
 typedef struct _XrSurface XrSurface;
 
+_XFUNCPROTOBEGIN
+
 /* Functions for manipulating state objects */
 XrState *
 XrCreate(void);
@@ -112,7 +114,7 @@
 } XrOperator;
 
 void
-XrSetOperator(XrState *xrs, XrOperator operator);
+XrSetOperator(XrState *xrs, XrOperator op);
 
 void
 XrSetRGBColor(XrState *xrs, double red, double green, double blue);
@@ -348,6 +350,8 @@
 
 XrStatus
 XrSurfaceSetRepeat (XrSurface *surface, int repeat);
+
+_XFUNCPROTOEND
 
 #endif
 

Index: xr.c
===================================================================
RCS file: /local/src/CVS/Xr/src/xr.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- xr.c	17 Apr 2003 20:24:29 -0000	1.19
+++ xr.c	23 Apr 2003 14:20:00 -0000	1.20
@@ -114,12 +114,12 @@
 }
 
 void
-XrSetOperator(XrState *xrs, XrOperator operator)
+XrSetOperator(XrState *xrs, XrOperator op)
 {
     if (xrs->status)
 	return;
 
-    xrs->status = _XrGStateSetOperator(_XR_CURRENT_GSTATE(xrs), operator);
+    xrs->status = _XrGStateSetOperator(_XR_CURRENT_GSTATE(xrs), op);
 }
 
 void