[patch] S/390 (Xvnc)

[Tim Waugh]

Hi,

This patch for VNC 3.3.3r2 adds support for the S/390 architecture.

Tim.
*/

diff -urN vnc_unixsrc.nos390/Xvnc/config/cf/Imake.cf vnc_unixsrc/Xvnc/config/cf/Imake.cf
--- vnc_unixsrc.nos390/Xvnc/config/cf/Imake.cf	Wed Dec  5 18:25:03 2001
+++ vnc_unixsrc/Xvnc/config/cf/Imake.cf	Wed Dec  5 19:09:29 2001
@@ -567,6 +567,14 @@
 #  define Mc68020Architecture
 #  undef mc68000
 # endif /* mc68000 */
+# ifdef __s390__
+#  define s390Architecture
+#  undef __s390__
+# endif /* __s390__ */
+# ifdef __s390x__
+#  define s390xArchitecture
+#  undef __s390x__
+# endif /* __s390x__ */
 # ifdef powerpc
 #  define PowerPCArchitecture
 #  undef powerpc
diff -urN vnc_unixsrc.nos390/Xvnc/config/cf/linux.cf vnc_unixsrc/Xvnc/config/cf/linux.cf
--- vnc_unixsrc.nos390/Xvnc/config/cf/linux.cf	Wed Dec  5 18:25:03 2001
+++ vnc_unixsrc/Xvnc/config/cf/linux.cf	Wed Dec  5 19:10:39 2001
@@ -42,7 +42,8 @@
 #ifndef DefaultLinuxCLibMajorVersion
 #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
     defined(SparcArchitecture) || defined(ArmArchitecure) || \
-    defined(i386Architecture)
+    defined(i386Architecture) || defined(s390Architecture) || \
+    defined(s390xArchitecture)
 #define DefaultLinuxCLibMajorVersion	6
 #else
 #define DefaultLinuxCLibMajorVersion	5
@@ -267,6 +268,20 @@
 #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif /* Mc68020Architecture */
 
+#ifdef s390Architecture
+#define OptimzedCDebugFlags     -O2
+#define LinuxMachineDefines     -D__s390__
+#define ServerOSDefines     XFree86ServerOSDefines -DDDXTIME -DPART_NET
+#define ServerExtraDefines  -DGCCUSESGAS XFree86ServerDefines
+#endif /* s390Architecture */
+
+#ifdef s390xArchitecture
+#define OptimzedCDebugFlags     -O2
+#define LinuxMachineDefines     -D__s390x__
+#define ServerOSDefines     XFree86ServerOSDefines -DDDXTIME -DPART_NET
+#define ServerExtraDefines  -DGCCUSESGAS XFree86ServerDefines
+#endif /* s390xArchitecture */
+
 #ifdef PowerPCArchitecture
 #define DefaultCCOptions        -fsigned-char
 #define OptimizedCDebugFlags	-O2
diff -urN vnc_unixsrc.nos390/Xvnc/config/imake/imakemdep.h vnc_unixsrc/Xvnc/config/imake/imakemdep.h
--- vnc_unixsrc.nos390/Xvnc/config/imake/imakemdep.h	Wed Dec  5 18:25:03 2001
+++ vnc_unixsrc/Xvnc/config/imake/imakemdep.h	Wed Dec  5 19:13:00 2001
@@ -475,6 +475,12 @@
 	"-traditional",
 # endif
 #endif
+#ifdef __s390__
+    "-D__s390__",
+#endif
+#ifdef __s390x__
+    "-D__s390x__",
+#endif
 #ifdef Oki
 	"-DOki",
 #endif
diff -urN vnc_unixsrc.nos390/Xvnc/programs/Xserver/include/servermd.h vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h
--- vnc_unixsrc.nos390/Xvnc/programs/Xserver/include/servermd.h	Mon Jul 28 15:17:34 1997
+++ vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h	Wed Dec  5 19:12:17 2001
@@ -336,6 +336,11 @@
 
 #endif /* luna */
 
+#if ((defined(__s390__) || defined(__s390x__)) && defined(linux))
+#define IMAGE_BYTE_ORDER   MSBFirst
+#define BITMAP_BIT_ORDER   MSBFirst
+#endif /* (__s390__ || __s390x__) && linux */
+    
 #if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && defined(__i386__)) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__)))
 
 #ifndef IMAGE_BYTE_ORDER
---------------------------------------------------------------------
To unsubscribe, mail majordomo "at" uk.research.att.com with the line:
'unsubscribe vnc-list' in the message BODY
See also: http://www.uk.research.att.com/vnc/intouch.html
---------------------------------------------------------------------