diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-23 07:51:31 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-23 07:51:31 +0000 |
| commit | 71e1361d0fd4c2d1c6c31f9a28d474fceee7e12e (patch) | |
| tree | 4e5cebc3ac6d1c0f5dd765697a7c2ad7be796136 /xorg-server/hw/xfree86/os-support/xf86_OSlib.h | |
| parent | 374f6889ce26ba0a914d07f4946cd113263a6e18 (diff) | |
| parent | 8fd06c45853cb2300105db84e4b722f0e2dad8d2 (diff) | |
| download | vcxsrv-71e1361d0fd4c2d1c6c31f9a28d474fceee7e12e.tar.gz vcxsrv-71e1361d0fd4c2d1c6c31f9a28d474fceee7e12e.tar.bz2 vcxsrv-71e1361d0fd4c2d1c6c31f9a28d474fceee7e12e.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/xf86_OSlib.h')
| -rw-r--r-- | xorg-server/hw/xfree86/os-support/xf86_OSlib.h | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h index c53fc0dac..3b646da70 100644 --- a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h +++ b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h @@ -85,22 +85,11 @@ /**************************************************************************/ #if (defined(SYSV) || defined(SVR4)) && \ (defined(sun) || defined(__i386__)) -# ifdef SCO325 -# ifndef _SVID3 -# define _SVID3 -# endif -# ifndef _NO_STATIC -# define _NO_STATIC -# endif -# endif # include <sys/ioctl.h> # include <signal.h> # include <termio.h> # include <sys/stat.h> # include <sys/types.h> -# if defined(__SCO__) -# include <sys/param.h> -# endif # include <errno.h> @@ -140,15 +129,7 @@ # if !defined(sun) # include <sys/emap.h> # endif -# if defined(SCO325) -# include <sys/vtkd.h> -# include <sys/console.h> -# include <sys/scankbd.h> -# include <sys/vid.h> -# define LED_CAP CLKED -# define LED_NUM NLKED -# define LED_SCR SLKED -# elif defined(HAS_USL_VTS) +# if defined(HAS_USL_VTS) # if !defined(sun) # include <sys/at_ansi.h> # endif @@ -177,20 +158,12 @@ # define VT_ACKACQ 2 # endif /* !VT_ACKACQ */ -# if defined(__SCO__) -# include <sys/sysmacros.h> -# define POSIX_TTY -# endif /* __SCO__ */ -# if defined(SVR4) || defined(SCO325) +# if defined(SVR4) # include <sys/mman.h> # if !(defined(sun) && defined (SVR4)) # define DEV_MEM "/dev/pmem" # endif -# ifdef SCO325 -# undef DEV_MEM -# define DEV_MEM "/dev/mem" -# endif # define CLEARDTR_SUPPORT # define POSIX_TTY # endif /* SVR4 */ |