XBUG 7335, IRIX 6 support

7 files changed, 41 insertions, 13 deletions

diff --git a/xc/programs/Xserver/cfb/cfb8bit.h b/xc/programs/Xserver/cfb/cfb8bit.h
index 6136ddf2b..c2b6f94c9 100644
--- a/xc/programs/Xserver/cfb/cfb8bit.h
+++ b/xc/programs/Xserver/cfb/cfb8bit.h
@@ -34,7 +34,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from the X Consortium.
 */
 
-/* $XConsortium: cfb8bit.h,v 1.16 94/04/17 20:28:40 dpw Exp dpw $ */
+/* $XConsortium: cfb8bit.h,v 1.17 94/09/29 20:33:11 dpw Exp kaleb $ */
 
 #include "servermd.h"
 
@@ -612,6 +612,7 @@ extern int		cfb8StippleRRop;
 	        SwitchBitsLoop (((CARD32 *) (dst))[QuadPixel1] = (pixel);) \
 	        break; 							   \
 	} 								   \
+    }									   \
 }
 #endif /* PGSZ == 64 */
 #endif /* PSZ == 8 */
diff --git a/xc/programs/Xserver/dix/dispatch.c b/xc/programs/Xserver/dix/dispatch.c
index fe44eda8a..2439ba6c3 100644
--- a/xc/programs/Xserver/dix/dispatch.c
+++ b/xc/programs/Xserver/dix/dispatch.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dispatch.c,v 5.66 94/10/19 21:59:25 dpw Exp kaleb $ */
+/* $XConsortium: dispatch.c,v 5.67 94/11/02 15:58:49 kaleb Exp kaleb $ */
 /************************************************************
 
 Copyright (c) 1987, 1989  X Consortium
@@ -87,8 +87,8 @@ extern void SwapConnClientPrefix(
 Selection *CurrentSelections;
 int NumCurrentSelections;
 
-extern long defaultScreenSaverTime;
-extern long defaultScreenSaverInterval;
+extern CARD32 defaultScreenSaverTime;
+extern CARD32 defaultScreenSaverInterval;
 extern int  defaultScreenSaverBlanking;
 extern int  defaultScreenSaverAllowExposures;
 static ClientPtr grabClient;
diff --git a/xc/programs/Xserver/dix/main.c b/xc/programs/Xserver/dix/main.c
index 2b98f1a37..6c332e88b 100644
--- a/xc/programs/Xserver/dix/main.c
+++ b/xc/programs/Xserver/dix/main.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: main.c,v 5.31 94/11/02 15:58:17 kaleb Exp dpw $ */
+/* $XConsortium: main.c,v 5.32 95/01/03 14:32:03 dpw Exp kaleb $ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -66,8 +66,8 @@ SOFTWARE.
 #include "site.h"
 #include "dixfont.h"
 
-extern long defaultScreenSaverTime;
-extern long defaultScreenSaverInterval;
+extern CARD32 defaultScreenSaverTime;
+extern CARD32 defaultScreenSaverInterval;
 extern int defaultScreenSaverBlanking;
 extern int defaultScreenSaverAllowExposures;
 
diff --git a/xc/programs/Xserver/include/servermd.h b/xc/programs/Xserver/include/servermd.h
index d2e5e86e3..6f5a9b682 100644
--- a/xc/programs/Xserver/include/servermd.h
+++ b/xc/programs/Xserver/include/servermd.h
@@ -47,7 +47,7 @@ SOFTWARE.
 ******************************************************************/
 #ifndef SERVERMD_H
 #define SERVERMD_H 1
-/* $XConsortium: servermd.h,v 1.72 94/11/21 18:26:34 kaleb Exp kaleb $ */
+/* $XConsortium: servermd.h,v 1.73 95/01/09 20:56:43 kaleb Exp kaleb $ */
 
 /*
  * Machine dependent values:
@@ -363,9 +363,34 @@ SOFTWARE.
 
 #define IMAGE_BYTE_ORDER	MSBFirst
 #define BITMAP_BIT_ORDER	MSBFirst
+
+#if (_MIPS_SZLONG == 64)
+
+# define GLYPHPADBYTES		4
+# define GETLEFTBITS_ALIGNMENT	1
+
+/* pad scanline to a longword */
+#define BITMAP_SCANLINE_UNIT			64
+
+#define BITMAP_SCANLINE_PAD 			64
+#define LOG2_BITMAP_PAD				6
+#define LOG2_BYTES_PER_SCANLINE_PAD		3
+
+/* Add for handling protocol XPutImage and XGetImage; see comment below */
+#define INTERNAL_VS_EXTERNAL_PADDING
+#define BITMAP_SCANLINE_UNIT_PROTO		32
+
+#define BITMAP_SCANLINE_PAD_PROTO 	 	32
+#define LOG2_BITMAP_PAD_PROTO			5
+#define LOG2_BYTES_PER_SCANLINE_PAD_PROTO	2
+
+#else
+
 #define GLYPHPADBYTES		2
 #define GETLEFTBITS_ALIGNMENT	4
 
+#endif
+
 #define AVOID_MEMORY_READ
 #define FAST_CONSTANT_OFFSET_MODE
 #define LARGE_INSTRUCTION_CACHE
diff --git a/xc/programs/Xserver/mfb/maskbits.c b/xc/programs/Xserver/mfb/maskbits.c
index 0a00e3007..c08cc58ec 100644
--- a/xc/programs/Xserver/mfb/maskbits.c
+++ b/xc/programs/Xserver/mfb/maskbits.c
@@ -1,4 +1,4 @@
-/* $XConsortium: maskbits.c,v 1.14 94/01/21 22:01:41 dpw Exp $ */
+/* $XConsortium: maskbits.c,v 1.15 94/04/17 20:28:09 dpw Exp kaleb $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /*
 
@@ -108,7 +108,7 @@ PixelType starttab[PPW+1] =
 	LONG2CHARS( 0x00000007FFFFFFFF ),
 	LONG2CHARS( 0x00000003FFFFFFFF ),
 	LONG2CHARS( 0x00000001FFFFFFFF ),
-	LONG2CHARS( 0x00000000FFFFFFFF )
+	LONG2CHARS( 0x00000000FFFFFFFF ),
 #endif /* PPW == 64 */
 	LONG2CHARS( 0x7FFFFFFF ),
 	LONG2CHARS( 0x3FFFFFFF ),
diff --git a/xc/programs/Xserver/os/utils.c b/xc/programs/Xserver/os/utils.c
index 4679f4920..1e44830ae 100644
--- a/xc/programs/Xserver/os/utils.c
+++ b/xc/programs/Xserver/os/utils.c
@@ -1,4 +1,4 @@
-/* $XConsortium: utils.c,v 1.146 94/04/17 20:27:07 erik Exp dpw $ */
+/* $XConsortium: utils.c,v 1.147 94/08/16 14:03:23 dpw Exp kaleb $ */
 /*
 
 Copyright (c) 1987  X Consortium
@@ -570,7 +570,7 @@ char	*argv[];
 	else if ( strcmp( argv[i], "-to") == 0)
 	{
 	    if(++i < argc)
-		TimeOutValue = ((long)atoi(argv[i])) * MILLI_PER_SECOND;
+		TimeOutValue = ((CARD32)atoi(argv[i])) * MILLI_PER_SECOND;
 	    else
 		UseMsg();
 	}
diff --git a/xc/programs/xterm/resize.c b/xc/programs/xterm/resize.c
index 62f3ed0f7..708a4cac8 100644
--- a/xc/programs/xterm/resize.c
+++ b/xc/programs/xterm/resize.c
@@ -1,5 +1,5 @@
 /*
- *	$XConsortium: resize.c,v 1.31 94/11/30 23:51:18 kaleb Exp kaleb $
+ *	$XConsortium: resize.c,v 1.32 95/01/16 20:03:38 kaleb Exp kaleb $
  */
 
 /*
@@ -77,8 +77,10 @@
 
 #ifdef USE_USG_PTYS
 #include <sys/stream.h>
+#ifndef SVR4
 #include <sys/ptem.h>
 #endif
+#endif
 
 #include <signal.h>
 #include <pwd.h>