--- OLD/xc/programs/Xserver/XIE/include/error.h	Thu Jan  1 00:00:00 1970
+++ NEW/xc/programs/Xserver/XIE/include/error.h	Thu Jan  1 00:00:00 1970
@@ -96,22 +96,22 @@
  * convenience macros for general flo errors
  */
 #define	FloAccessError(flo,tag,type,xfer) \
-		{FloError(flo,(xieTypPhototag)tag,(CARD16)type,\
+		{FloError(flo,(xieTypPhototag)(tag),(CARD16)(type),\
 			  (CARD8)xieErrNoFloAccess); xfer;}
 #define	FloAllocError(flo,tag,type,xfer) \
-		{FloError(flo,(xieTypPhototag)tag,(CARD16)type,\
+		{FloError(flo,(xieTypPhototag)(tag),(CARD16)(type),\
 			  (CARD8)xieErrNoFloAlloc); xfer;}
 #define	FloElementError(flo,tag,type,xfer) \
-		{FloError(flo,(xieTypPhototag)tag,(CARD16)type,\
+		{FloError(flo,(xieTypPhototag)(tag),(CARD16)(type),\
 			  (CARD8)xieErrNoFloElement); xfer;}
 #define	FloImplementationError(flo,tag,type,xfer) \
-		{FloError(flo,(xieTypPhototag)tag,(CARD16)type,\
+		{FloError(flo,(xieTypPhototag)(tag),(CARD16)(type),\
 			  (CARD8)xieErrNoFloImplementation); xfer;}
 #define	FloLengthError(flo,tag,type,xfer) \
-		{FloError(flo,(xieTypPhototag)tag,(CARD16)type,\
+		{FloError(flo,(xieTypPhototag)(tag),(CARD16)(type),\
 			  (CARD8)xieErrNoFloLength); xfer;}
 #define	FloSourceError(flo,tag,type,xfer) \
-		{FloError(flo,(xieTypPhototag)tag,(CARD16)type,\
+		{FloError(flo,(xieTypPhototag)(tag),(CARD16)(type),\
 			  (CARD8)xieErrNoFloSource); xfer;}
 
 /*