xserver: Branch 'master' - 3 commits
Adam Jackson
ajax at kemper.freedesktop.org
Wed Jul 23 10:37:58 PDT 2008
fb/fb.h | 3 -
hw/dmx/dmxinit.c | 10 ----
hw/vfb/InitOutput.c | 5 --
hw/xfree86/common/compiler.h | 4 -
hw/xfree86/common/xf86Events.c | 2
hw/xfree86/loader/os.c | 2
hw/xfree86/os-support/xf86_OSlib.h | 77 -------------------------------------
hw/xfree86/x86emu/x86emu/types.h | 5 --
hw/xnest/Init.c | 5 --
include/servermd.h | 16 -------
mi/micoord.h | 2
os/access.c | 2
os/connection.c | 3 -
os/osdep.h | 2
os/utils.c | 19 ---------
xkb/ddxLoad.c | 2
xkb/xkbInit.c | 8 ---
17 files changed, 12 insertions(+), 155 deletions(-)
New commits:
commit bd8bd2c700e6ccac53b47c45766c0a3a08a59344
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Jul 23 13:36:35 2008 -0400
Unifdef AIX.
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index bdd1f93..6bf6a33 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -1022,8 +1022,3 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
}
} /* end InitOutput */
-
-/* this is just to get the server to link on AIX */
-#ifdef AIXV3
-int SelectWaitTime = 10000; /* usec */
-#endif
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index f52445c..f80bbd1 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -140,8 +140,3 @@ void ddxBeforeReset(void)
{
return;
}
-
-/* this is just to get the server to link on AIX */
-#ifdef AIXV3
-int SelectWaitTime = 10000; /* usec */
-#endif
diff --git a/include/servermd.h b/include/servermd.h
index 8662426..2b937ff 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -150,13 +150,6 @@ SOFTWARE.
#endif /* sun && !(i386 && SVR4) */
-#if defined(AIXV3)
-
-#define IMAGE_BYTE_ORDER MSBFirst /* Values for the RISC/6000 */
-#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4
-
-#endif /* AIXV3 */
#if defined(ibm032) || defined (ibm)
diff --git a/os/connection.c b/os/connection.c
index 0217762..89795bf 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -90,9 +90,6 @@ SOFTWARE.
#include <sys/ioctl.h>
#endif
-#ifdef AIXV3
-#include <sys/ioctl.h>
-#endif
#if defined(TCPCONN) || defined(STREAMSCONN)
# include <netinet/in.h>
diff --git a/os/utils.c b/os/utils.c
index 35f1e84..86f13f1 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -231,10 +231,6 @@ int auditTrailLevel = 1;
_X_EXPORT Bool Must_have_memory = FALSE;
-#ifdef AIXV3
-int SyncOn = 0;
-extern int SelectWaitTime;
-#endif
#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
#define HAS_SAVED_IDS_AND_SETEUID
@@ -509,7 +505,6 @@ AdjustWaitForDelay (pointer waitTime, unsigned long newdelay)
void UseMsg(void)
{
-#if !defined(AIXrt) && !defined(AIX386)
ErrorF("use: X [:<display>] [option]\n");
ErrorF("-a # mouse acceleration (pixels)\n");
ErrorF("-ac disable access control restrictions\n");
@@ -590,7 +585,6 @@ void UseMsg(void)
#ifdef XDMCP
XdmcpUseMsg();
#endif
-#endif /* !AIXrt && ! AIX386 */
#ifdef XKB
XkbUseMsg();
#endif
@@ -965,19 +959,6 @@ ProcessCommandLine(int argc, char *argv[])
i = skip - 1;
}
#endif
-#ifdef AIXV3
- else if ( strcmp( argv[i], "-timeout") == 0)
- {
- if(++i < argc)
- SelectWaitTime = atoi(argv[i]);
- else
- UseMsg();
- }
- else if ( strcmp( argv[i], "-sync") == 0)
- {
- SyncOn++;
- }
-#endif
#ifdef SMART_SCHEDULE
else if ( strcmp( argv[i], "-dumbSched") == 0)
{
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 115f855..25a07f0 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -48,7 +48,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XI.h>
#include "xkb.h"
-#if defined(CSRG_BASED) || defined(linux) || defined(AIXV3) || defined(__osf__) || defined(__GNU__)
+#if defined(CSRG_BASED) || defined(linux) || defined(__osf__) || defined(__GNU__)
#include <paths.h>
#endif
commit 5f5eed7f790db2f0ae0cd0f5c5ee5a312079c0b0
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Jul 23 13:27:24 2008 -0400
Unifdef DGUX.
diff --git a/hw/xfree86/loader/os.c b/hw/xfree86/loader/os.c
index 9b3c964..a73ef93 100644
--- a/hw/xfree86/loader/os.c
+++ b/hw/xfree86/loader/os.c
@@ -52,8 +52,6 @@
#define OSNAME "hurd"
#elif defined(__SCO__)
#define OSNAME "sco"
-#elif defined(DGUX)
-#define OSNAME "dgux"
#elif defined(ISC)
#define OSNAME "isc"
#elif defined(SVR4) && defined(sun)
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index a8340fb..a12e0e8 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -84,7 +84,6 @@
/* SYSV386 (SVR3, SVR4), including Solaris */
/**************************************************************************/
#if (defined(SYSV) || defined(SVR4)) && \
- !defined(DGUX) && \
(defined(sun) || defined(__i386__))
# ifdef SCO325
# ifndef _SVID3
@@ -214,74 +213,7 @@
# define VT_SYSREQ_DEFAULT TRUE
# endif
-#endif /* (SYSV || SVR4) && !DGUX */
-
-
-
-/**************************************************************************/
-/* DG/ux R4.20MU03 Intel AViion Machines */
-/**************************************************************************/
-#if defined(DGUX) && defined(SVR4)
-#include <sys/ioctl.h>
-#include <signal.h>
-#include <ctype.h>
-#include <termios.h> /* Use termios for BSD Flavor ttys */
-#include <sys/termios.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <errno.h>
-#include <sys/sysi86.h>
-#include <unistd.h>
-#include <sys/proc.h>
-#include <sys/map.h>
-#include <sys/sysmacros.h>
-#include <sys/mman.h> /* Memory handling */
-#include <sys/kd.h> /* definitios for KDENABIO KDDISABIO needed for IOPL s */
-#include <sys/kbd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <sys/stream.h>
-#include <sys/ptms.h>
-
-#include <sys/socket.h>
-#include <sys/utsname.h>
-#include <sys/stropts.h>
-#include <sys/sockio.h>
-
-
-#define POSIX_TTY
-
-#undef HAS_USL_VTS
-#undef USE_VT_SYSREQ
-#undef VT_ACKACQ
-
-#define LED_CAP KBD_LED_CAPS_LOCK
-#define LED_NUM KBD_LED_NUM_LOCK
-#define LED_SCR KBD_LED_SCROLL_LOCK
-
-#define KDGKBTYPE KBD_GET_LANGUAGE
-
-
-/* General keyboard types */
-# define KB_84 2
-# define KB_101 1 /* Because ioctl(dgkeybdFd,KBD_GET_LANGUAGE,&type) gives 1=US keyboard */
-# define KB_OTHER 3
-
-#define KDSETLED KBD_SET_LED
-#define KDGETLED KBD_GET_STATE
-#undef KDMKTONE
-#define KDMKTONE KBD_TONE_HIGH
-
-
-#undef DEV_MEM
-#define DEV_MEM "/dev/mem"
-#define CLEARDTR_SUPPORT
-
-#undef VT_SYSREQ_DEFAULT
-#define VT_SYSREQ_DEFAULT FALSE /* Make sure that we dont define any VTs since DG/ux has none */
-
-#endif /* DGUX && SVR4 */
+#endif /* (SYSV || SVR4) */
/**************************************************************************/
/* Linux or Glibc-based system */
commit 856db05b58b71c5ff22af727aba435a8c356abfa
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Jul 23 13:25:37 2008 -0400
Unifdef sgi.
diff --git a/fb/fb.h b/fb/fb.h
index 9d514b4..2bb88e3 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -139,8 +139,7 @@ typedef unsigned __int64 FbBits;
defined(__sparc64__) || defined(_LP64) || \
defined(__s390x__) || \
defined(amd64) || defined (__amd64__) \
- defined (__powerpc64__) || \
- (defined(sgi) && (_MIPS_SZLONG == 64))
+ defined (__powerpc64__)
typedef unsigned long FbBits;
# else
typedef unsigned long long FbBits;
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index 760fccf..6a0c259 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -508,7 +508,7 @@ static void dmxDisplayInit(DMXScreenInfo *dmxScreen)
/* If this doesn't compile, just add || defined(yoursystem) to the line
* below. This information is to help with bug reports and is not
* critical. */
-#if !defined(_POSIX_SOURCE) && !defined(__sgi)
+#if !defined(_POSIX_SOURCE)
static const char *dmxExecOS(void) { return ""; }
#else
#include <sys/utsname.h>
@@ -538,14 +538,6 @@ static const char *dmxBuildCompiler(void)
#if defined(__GNUC__) && defined(__GNUC_MINOR__) &&defined(__GNUC_PATCHLEVEL__)
XmuSnprintf(buffer, sizeof(buffer)-1, "gcc %d.%d.%d",
__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
-#elif defined(__sgi) && defined(_COMPILER_VERSION) && !defined(__GNUC__)
- {
- int a = _COMPILER_VERSION / 100;
- int b = (_COMPILER_VERSION - a * 100) / 10;
- int c = _COMPILER_VERSION - a * 100 - b * 10;
- XmuSnprintf(buffer, sizeof(buffer)-1, "SGI MIPSpro %d.%d.%d",
- a, b, c);
- }
#endif
}
return buffer;
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 24f9ae6..886c639 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -1488,13 +1488,13 @@ inl(unsigned short port)
# define uint_t unsigned int
# define uchar_t unsigned char
# endif /* __UNIXWARE__ */
-# if !defined(sgi) && !defined(__SUNPRO_C)
+# if !defined(__SUNPRO_C)
# include <sys/inline.h>
# endif
# else
# include "scoasm.h"
# endif
-# if (!defined(__HIGHC__) && !defined(sgi) && !defined(__SUNPRO_C)) || \
+# if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \
defined(__USLC__)
# pragma asm partial_optimization outl
# pragma asm partial_optimization outw
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 832de10..6bc6bbd 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -277,7 +277,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
CloseDownClient(server);
}
break;
-#if !defined(__SOL8__) && !defined(sgi) && \
+#if !defined(__SOL8__) && \
(!defined(sun) || defined(__i386__)) && defined(VT_ACTIVATE)
case ACTION_SWITCHSCREEN:
if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) {
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 7469d55..a8340fb 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -84,7 +84,7 @@
/* SYSV386 (SVR3, SVR4), including Solaris */
/**************************************************************************/
#if (defined(SYSV) || defined(SVR4)) && \
- !defined(DGUX) && !defined(sgi) && \
+ !defined(DGUX) && \
(defined(sun) || defined(__i386__))
# ifdef SCO325
# ifndef _SVID3
@@ -479,13 +479,6 @@
/**************************************************************************/
/* IRIX */
/**************************************************************************/
-#if defined(sgi)
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#endif
/**************************************************************************/
/* Generic */
diff --git a/hw/xfree86/x86emu/x86emu/types.h b/hw/xfree86/x86emu/x86emu/types.h
index c0c09c1..c18e11c 100644
--- a/hw/xfree86/x86emu/x86emu/types.h
+++ b/hw/xfree86/x86emu/x86emu/types.h
@@ -74,9 +74,8 @@
defined(__ia64__) || defined(ia64) || \
defined(__sparc64__) || \
defined(__s390x__) || \
- (defined(__hppa__) && defined(__LP64)) || \
- defined(__amd64__) || defined(amd64) || \
- (defined(__sgi) && (_MIPS_SZLONG == 64))
+ defined(__hppa__) && defined(__LP64) || \
+ defined(__amd64__) || defined(amd64)
#define NUM32 int
#else
#define NUM32 long
diff --git a/include/servermd.h b/include/servermd.h
index 13414f7..8662426 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -175,7 +175,7 @@ SOFTWARE.
#endif /* ibm */
-#if (defined(mips) || defined(__mips)) && !defined(sgi)
+#if (defined(mips) || defined(__mips))
#if defined(MIPSEL) || defined(__MIPSEL__)
# define IMAGE_BYTE_ORDER LSBFirst /* Values for the PMAX only */
@@ -261,13 +261,6 @@ SOFTWARE.
#endif /* linux/m68k */
-#ifdef sgi
-
-#define IMAGE_BYTE_ORDER MSBFirst
-#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4
-
-#endif
/* linux on ARM */
#if defined(linux) && defined(__arm__)
diff --git a/mi/micoord.h b/mi/micoord.h
index 16d0861..e6d814f 100644
--- a/mi/micoord.h
+++ b/mi/micoord.h
@@ -43,7 +43,7 @@
* forcing as to use div instead of shift. Let's be explicit.
*/
-#if defined(mips) || defined(sgi) || \
+#if defined(mips) || \
defined(sparc) || defined(__sparc64__) || \
defined(__alpha) || defined(__alpha__) || \
defined(__i386__) || defined(__i386) || defined(__ia64__) || \
diff --git a/os/access.c b/os/access.c
index c973cb1..6179d5b 100644
--- a/os/access.c
+++ b/os/access.c
@@ -290,7 +290,7 @@ AccessUsingXdmcp (void)
}
-#if ((defined(SVR4) && !defined(SCO325) && !defined(sun)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF)
+#if ( defined(SVR4) && !defined(SCO325) && !defined(sun) || defined(ISC)) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF)
/* Deal with different SIOCGIFCONF ioctl semantics on these OSs */
diff --git a/os/osdep.h b/os/osdep.h
index 1b8dcf7..af1d5a9 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -58,7 +58,6 @@ SOFTWARE.
#include <X11/Xdmcp.h>
-#ifndef sgi /* SGI defines OPEN_MAX in a useless way */
#ifdef _POSIX_SOURCE
#include <limits.h>
#else
@@ -66,7 +65,6 @@ SOFTWARE.
#include <limits.h>
#undef _POSIX_SOURCE
#endif
-#endif
#ifndef OPEN_MAX
#ifdef SVR4
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index d6b5f75..115f855 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -48,7 +48,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XI.h>
#include "xkb.h"
-#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__)
+#if defined(CSRG_BASED) || defined(linux) || defined(AIXV3) || defined(__osf__) || defined(__GNU__)
#include <paths.h>
#endif
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 8043f5a..9033a13 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -55,13 +55,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define CREATE_ATOM(s) MakeAtom(s,sizeof(s)-1,1)
-#ifdef sgi
-#define LED_CAPS 5
-#define LED_NUM 6
-#define LED_SCROLL 7
-#define PHYS_LEDS 0x7f
-#define LED_COMPOSE 8
-#else
#if defined(__osf__) || defined(__alpha) || defined(__alpha__)
#define LED_COMPOSE 2
#define LED_CAPS 3
@@ -82,7 +75,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define PHYS_LEDS 0x07
#endif
#endif
-#endif
#define MAX_TOC 16
typedef struct _SrvXkmInfo {
More information about the xorg-commit
mailing list