Index: xc/config/cf/Imake.cf =================================================================== RCS file: /cvs/xorg/xc/config/cf/Imake.cf,v retrieving revision 1.1.4.8 diff -u -3 -p -r1.1.4.8 Imake.cf --- xc/config/cf/Imake.cf 30 Mar 2004 14:23:10 -0000 1.1.4.8 +++ xc/config/cf/Imake.cf 18 Apr 2004 07:49:19 -0000 @@ -336,9 +336,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # define HPArchitecture #endif /* hpux */ -#ifdef sco +#ifdef __SCO__ # define MacroIncludeFile # define MacroFile sco5.cf +# undef __SCO__ # undef sco # undef USL # undef SYSV @@ -370,7 +371,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # undef __pentium # undef pentiumpro # undef __pentiumpro -#endif /* sco - SCO Open Server 5 */ +#endif /* __SCO__ - SCO Open Server 5 */ #ifdef USL # define MacroIncludeFile Index: xc/config/cf/host.def =================================================================== RCS file: /cvs/xorg/xc/config/cf/host.def,v retrieving revision 1.1 diff -u -3 -p -r1.1 host.def --- xc/config/cf/host.def 14 Nov 2003 15:54:29 -0000 1.1 +++ xc/config/cf/host.def 18 Apr 2004 07:49:19 -0000 @@ -0,0 +1,699 @@ +XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ +/******************************************************************************/ +/* + * This file is to provide a quick method for most people to change the + * behaviour of their XFree86 installation without having to fully + * understand the workings of site.def and all the various '.cf' files. + * + * In the vast majority of cases, it should not be necessary to use this + * file at all or change it in any way. + * + * This file is divided into two sections. The first contains settings + * that end-users might reasonably change. The second contains settings + * that developers might want to change. + * + * IMPORTANT NOTE: In all cases changing the defaults may cause problems + * and/or unexpected side-effects. If you don't understand what a setting + * does, then it's best to not change it. If you make changes and have + * problems, verify that those problems are also present when using an + * empty host.def file and unchanged version of this file before reporting + * them. + * + * A good way to use this file is to copy it to host.def, and make the + * changes there. That way, future patches to this file won't fail. + * The host.def file will never be patched. + * + * The distributed version of this file MUST contain no uncommented + * definitions. Default definitions belong in xfree86.cf, or .cf + * files. + */ +/******************************************************************************/ + +#define SCOAbsShlibPath YES + +/* + * If you have build-specific modifications in your host.def file, but + * want an empty host.def file installed when doing 'make install', + * uncomment the following + * +#define InstallEmptyHostDef + */ + +/* + * Which servers to build. There is only Xorg server. + * It can be disabled by the following. + * +#define XorgServer NO + */ + +/* + * To disable building the Xnest server, uncomment this. + * +#define XnestServer NO + */ + +/* + * To disable building Xvfb, uncomment this. + * +#define XVirtualFramebufferServer NO + */ + +/* + * To disable building Xprt, uncomment this. + * +#define XprtServer NO + */ + +/* + * Set the default server (ie the one that gets the sym-link to "X") + * +#define ServerToInstall XFree86 + */ + +/* + * If you only run the X server under xdm the X servers don't need to be + * installed SetUID, and you may comment out the lines below. If you run + * the servers by hand (with xinit or startx), then they do need to be + * installed SetUID on most platforms. + * + * Consult your system administrator before making the X server setuid. + * +#define InstallXserverSetUID NO + */ + + +/* + * Server configuration parameters. The defaults are shown here: + */ + +/* + * Which drivers to build. When building a static server, each of these + * will be included in it. When building the loadable server each of these + * modules will be built. + * +#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ + neomagic i740 tdfx savage \ + cirrus vmware tseng trident chips apm \ + GlideDriver fbdev i128 \ + ati AgpGartDrivers DevelDrivers ark cyrix \ + siliconmotion \ + vesa vga XF86OSCardDrivers XF86ExtraCardDrivers + */ + +/* + * To add third party drivers to the standard driver list, set the + * following. + * +#define XF86ExtraCardDrivers extradriver1 extradriver2 ... + */ + +/* + * Select the XInput devices you want by uncommenting this. + * +#define XInputDrivers mouse keyboard acecad calcomp citron \ + digitaledge dmc dynapro elographics \ + microtouch mutouch penmount spaceorb summa \ + wacom void magictouch aiptek + */ + +/* + * There are three parameters that determine where and how the Matrox HAL + * library is used: + * + * HaveMatroxHal -- You have the HALlib.a binary library installed + * in xfree86/drivers/mga/HALlib, and you want it to + * be used. + * Default: NO + * + * BuildMatroxHal -- You have the source for the HALlib library (installed + * in xfree86/drivers/mga/hallib), and want to build and + * use it. + * Default: NO + * + * UseMatroxHal -- You want to build support for loading/using the HAL + * library into the mga driver. For module server builds + * you don't need to have the HALlib library to do this. + * but you want to build support for loading it and using + * it into the mga driver module. + * Default: YES for loadable server build + * (HaveMatroxHal || BuildMatroxHal) for static + */ + +/* + * To disable use of the Matrox HAL library, uncomment this: + * +#define UseMatroxHal NO + */ + +/* + * If you have the HALlib.a binary installed in xfree86/drivers/mga/HALlib, + * uncomment this: + * +#define HaveMatroxHal YES + */ + +/* + * If you have the HALlib source code installed in xfree86/drivers/mga/hallib, + * uncomment this: +#define BuildMatroxHal YES + */ + +/* + * To disable building the font server, uncomment this. + * +#define BuildFontServer NO + */ + +/* + * To disable support for Speedo fonts, uncomment this. + * +#define BuildSpeedo NO + */ + +/* + * To disable support for Type1 fonts, uncomment this. + * +#define BuildType1 NO + */ + +/* + * To disable support for CID fonts, uncomment this. + * +#define BuildCID NO + */ + +/* + * To disable support for TrueType fonts, uncomment these. + * +#define BuildFreeType NO +#define BuildXTrueType NO + */ + +/* + * To set non-default build options for the underlying FreeType libraries, + * add them here and uncomment. + * +#define Freetype2BuildDefines -DFREETYPE_BUILD_DEFINES + */ + +/* + * If you want to use FreeType 1.x build options that differ from the FreeType2 + * build options, set them here and uncomment. Otherwise the Freetype2 build + * options will be used for both FreeType 2.x and 1.x. Note: FreeType 1.x + * is currently only used for the X-TrueType (xtt) module. + * +#define Freetype1BuildDefines -DFREETYPE1_BUILD_DEFINES + */ + +/* + * To build the FreeType libraries with the TrueType byte code interpreter + * enabled, uncomment this. Note that there are patent issues related to the + * TrueType byte code interpreter, and we only recommend you enabling this + * if you are sure that there are no legal impediments to you doing so. See + * for further information. + * +#define Freetype2BuildDefines -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER + */ + +/* + * Do you want to Build Fonts (Usually you only want to build and install + * fonts once, if this is a first time install you will want to build the + * fonts) + * +#define BuildFonts NO + */ + +/* + * To not build/install the 75dpi fonts, uncomment the following + * +#define Build75DpiFonts NO + */ + +/* + * To not build/install the 100dpi fonts, uncomment the following + * +#define Build100DpiFonts NO + */ + +/* + * To not build/install the Speedo fonts, uncomment the following + * +#define BuildSpeedoFonts NO + */ + +/* + * To not build/install the Type1 fonts, uncomment the following + * +#define BuildType1Fonts NO + */ + +/* + * To not build/install the CID fonts, uncomment the following + * +#define BuildCIDFonts NO + */ + +/* + * To not build/install the True Type fonts, uncomment the following + * +#define BuildTrueTypeFonts NO + */ + +/* + * To not build/install the Cyrillic fonts, uncomment the following + * +#define BuildCyrillicFonts NO + */ + +/* + * To not install the local font directory, uncomment the following + * +#define MakeLocalFontDir NO + */ + +/* + * To build only the servers with a cut-down source tree, uncomment + * this. + * +#define BuildServersOnly YES + */ + +/* + * By default, the sample config files for xinit, xdm and xfs are installed + * only when there is no pre-existing version installed. Uncommenting the + * following lines will force the sample versions to be installed even if + * it means over-writing existing versions. + * +#define InstallXinitConfig YES +#define InstallXdmConfig YES +#define InstallFSConfig YES + */ + +/* + * By default the application defaults files are always installed. + * Uncommenting the the following will prevent exising application + * defaults files from being over-written. + * +#define InstallAppDefFiles NO + */ + +/* + * Undefine the following if you don't want to have config files and + * app-defaults installed in a separate directory (i.e. /etc/X11). + * + */ +#define UseSeparateConfDir NO + +/* + * To enable building the glide driver, you need to define + * HasGlide2 to YES and set the Glide2IncDir variable. + * HasGlide2 is per default NO. + * +#define HasGlide2 YES + */ + +/* + * Set the path to your Glide include files. + * +#define Glide2IncDir /usr/include/glide + */ + +/* + * Have glide 3? + * +#define HasGlide3 YES + */ + +/* + * Set the path to your Glide 3 include files. + * +#define Glide3IncDir /usr/include/glide3 + */ + + + +/* + * Unless you're a developer you shouldn't need to change anything + * beyond this point. + */ + +/* + * If you want to enable some developer settings, like more verbose + * compiler warnings, uncomment this. + * +#define XFree86Devel YES +*/ + +/* + * The default optimisation flags for GCC 2.x. -fno-strength-reduce is + * here to work around a bug in -O2 for GCC 2.x on i386 platforms. + * If you are using a version that doesn't have this bug, you can + * uncomment the following line, and remove '-fno-strength-reduce' + * If you are building binaries for a 486, it may be beneficial to add + * -m486 + * +#define DefaultGcc2i386Opt -O2 -fno-strength-reduce + */ + +/* + * This allows the GCC warning flags to be set. The default is shown here. + * +#define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \ + -Wmissing-prototypes -Wmissing-declarations \ + -Wredundant-decls -Wnested-externs + */ + +/* + * Sun Compiler stuff.. + * +#define HasSunC YES +#define HasSunCplusplus YES +#define CplusplusCompilerMajorVersion 5 +#define CplusplusCompilerMinorVersion 0 +#define CCompilerMajorVersion 5 +#define CCompilerMinorVersion 0 + */ + +/* + * Optimized Sun Compiler Build. + * +#define DefaultCDebugFlags -xO4 -xtarget=pentium_pro +#define OptimizedCDebugFlags -xO4 -xtarget=pentium_pro + */ + +/* + * Debuggable Sun Compiler Build. + * Note: This builds _EVERYTHING_ as debuggable + * +#define DefaultCDebugFlags -g -xs +#define OptimizedCDebugFlags -g -xs + */ + +/* + * For Linux, this should match the Binutils version you have. This example + * is for 2.6.0.7. See linux.cf for the default setting. + * + * This should automatically get set correctly by imake. + * +#define LinuxBinUtilsMajorVersion 26 + */ + +/* + * For Linux, these should match the libc version you have. This example + * is for libc.5.4.x. See linux.cf for the default setting. + * + * This should automatically get set correctly by imake. + * +#define LinuxCLibMajorVersion 5 +#define LinuxClibMinorVersion 4 + */ + +/* + * If you want to use the GNU malloc library, uncomment this + * +#define UseGnuMalloc YES + */ + +/* + * Set this to whatever is required to access the GNU malloc library. + * The default is '-lgmalloc' unless is specified in the OS's .cf file. + * +#define GnuMallocLibrary -L/usr/local/lib -lgmalloc + */ + +/* + * To enable the internal Xserver malloc, uncomment this + * +#define UseInternalMalloc YES + */ + +/* + * Some Linux releases don't have a libtermcap. In this case you may need + * to uncomment the following + * +#define TermcapLibrary -lncurses + */ + +/* + * Build a server that dynamically loads the modules by setting + * this to YES. This defaults to YES on most platforms. A static server + * can be built by setting this to NO. + * +#define DoLoadableServer NO + */ + +/* + * Build dlopen() style modules instead of the standard loader modules. + * Don't enable this unless you have specific development reasons for + * doing so and understand how to deal with the problems you'll run in to. + * + * Enabling this for regular use is NOT supported, and will almost + * certainly cause you problems. + * +#define MakeDllModules YES + */ + +/* + * Build XAA. This can be disabled with: + * +#define XF86XAA NO + */ + +/* + * Build vgahw. This can be disabled with: + * +#define XF86VgaHw NO + */ + +/* + * Build xf1bpp. This can be disabled with: + * +#define XF1Bpp NO + */ + +/* + * Build xf4bpp. This can be disabled with: + * +#define XF4Bpp NO + */ + + +/* + * BSD Console driver support (for FreeBSD and NetBSD). + * + * By default, support is included for pccons and pcvt for NetBSD, and + * pccons, syscons and pcvt for FreeBSD. + * + * To change the list of supported drivers, set the following parameter. + * Possible values are -DPCCONS_SUPPORT, -DSYSCONS_SUPPORT, -DPCVT_SUPPORT. + * The following example includes support for syscons and pcvt only. + * +#define XFree86ConsoleDefines -DSYSCONS_SUPPORT -DPCVT_SUPPORT + */ + +/* + * To link the X server with a dynamic version of the Xfont library, + * uncomment this. + * + */ +#define XserverStaticFontLib NO + +/* + * To enable binary compatibility with previous versions of the font + * encoding support, uncomment this. + * +#define FontencCompatibility YES + */ + +/* + * To disable building XInput support, uncomment this + * +#define BuildXInputExt NO + */ + +/* + * Uncomment this for joystick support. + * + * Note: Joystick support is broken, so don't enable this. + * +#define JoystickSupport YES + */ + +/* + * To disable the ScreenSaver Extension, uncomment this line. + * +#define BuildScreenSaverExt NO + */ + +/* + * If you don't want to build Xinerama support, uncomment this. + * +#define BuildXinerama NO + */ + +/* + * If you don't want to build support for the GLX extension, uncomment this. + * +#define BuildGlxExt NO + */ + +/* + * If you want to build the xf86rush extension, uncomment this line. + * This isn't recommended. + * +#define BuildXF86RushExt YES + */ + +/* + * If you want to build the client library for the xf86rush extension, + * uncomment this line. This isn't recommended. + * +#define BuildXF86RushLibrary NO + */ + +/* + * If you are running NetBSD 0.9C or later, and have the aperture driver + * installed, uncomment this. + * +#define HasNetBSDApertureDriver YES + */ + +/* + * If you are running SVR3 and have the mmap driver installed (for linear + * framebuffer access) uncomment this. + * +#define HasSVR3mmapDrv YES + */ + +/* + * If you are using an SVR3 (like ISC 4.x) which supports long file names, + * you can * uncomment this to have manual pages installed under their + * full names + * + */ +#define ExpandManNames YES + +/* + * For a POSIXized build on Interactive uncomment this + * Could be used with gcc 'till Version 2.6.3 + * Should be used with gcc 2.7.2. + * +#define UsePosix YES + */ + +/* + * If you want XDMAUTH support (if you have Wraphelp.c), uncomment this. + * + */ +#define HasXdmAuth YES + +/* + * If you have Linux DECnet support, and want to build XFree86 with support + * for connections over DECnet, uncomment this. + * +#define HasDECnet YES + */ + +/* + * To build static and shared libraries with debugging information, uncomment + * this. Assumes you have Gcc2. + * (If you don't have Gcc2, you can use the DebugLib{X11,Xt,Xaw,...} variables + * to build debugging versions of the libraries separately.) + * +#define DebuggableLibraries YES +*/ + +/* + * To forceably build static libraries in addition to shared libraries, + * uncomment this. + * +#define ForceNormalLib YES + */ + +/* + * Uncomment this if your default tools (eg, gcc, ld, as, etc) are + * not the Linux ELF versions. + * +#define LinuxElfDefault NO + */ + +/* + * To use ELF format shared libraries for supported OSs, uncomment this. + * + * For Linux the default setting of this is the same as the setting of + * LinuxElfDefault. + * + * For FreeBSD this should automatically be set correctly by imake. Only + * change it here if you need to override the automatic setting. + * +#define UseElfFormat YES + */ + +/* + * For FreeBSD/ELF (FreeBSD 3.0) it is possible to also build and install + * a.out compatibility libraries. To enable that, uncomment this. + * +#define BuildAoutLibraries YES + */ + +/* + * If you have trouble with make bombing out in Xlib, try uncommenting this. + * You will not get dependencies as a result, but better than nothing. + * +#define MakeHashTableBug YES + */ + +/* + * If you do not want your man pages compress under SVR3 systems that + * support it, uncomment this. + * +#define CompressManPages NO + */ + +/* + * If you have sgmlfmt (the XFree86 doctools package) and want to build + * formatted docs from the SGML source, uncomment this. + * +#define HasSgmlFmt YES + */ + +/* + * To disable building some document formats, uncomment some of these. + * +#define BuildLinuxDocText NO +#define BuildLinuxDocHtml NO +#define BuildLinuxDocPS NO + */ + +/* + * To install Japanese versions of the documentation uncomment this. + * Note: The Japanese documentation consists of a subset of the + * XFree86 3.1 docs. + * +#define InstallJapaneseDocs YES + */ + +/* + * To build/install X specs docs, uncomment the following. + * The SpecsDocDirs setting here is recommended because it covers + * the docs that XFree86 has changed or added. + * +#define BuildSpecsDocs YES +#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xmu Xv XvMC i18n xterm + */ + +/* + * To build all specs docs, not just those listed in SpecsDocDirs, uncomment + * the following. + * +#define BuildAllSpecsDocs YES + */ + +/* + * If your system doesn't support vm86() mode and you have + * libx86emu set library path here + * +#define X86EMU_LIBPATH /usr/local/lib + */ + + Index: xc/config/cf/sco5.cf =================================================================== RCS file: /cvs/xorg/xc/config/cf/sco5.cf,v retrieving revision 1.1.4.5 diff -u -3 -p -r1.1.4.5 sco5.cf --- xc/config/cf/sco5.cf 15 Apr 2004 10:13:10 -0000 1.1.4.5 +++ xc/config/cf/sco5.cf 18 Apr 2004 07:49:19 -0000 @@ -66,7 +66,7 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1 # define LibraryCCOptions -D_REENTRANT #endif -#define StandardDefines -Dsco -DSCO -DSCO5 -DSYSV -Di386 -DSCO325 -DFD_SETSIZE=256 -D_NO_STATIC -DMAXPATHLEN=1024 +#define StandardDefines -DSYSV -Di386 -DSCO325 -D__SCO__ -DFD_SETSIZE=256 -D_NO_STATIC -DMAXPATHLEN=1024 #ifdef HasGcc2 # define DefaultCCOptions GccWarningOptions # define CcCmd gcc @@ -106,6 +106,8 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1 # define SCODynamicFlags /**/ #endif +#define BuildFreetypeDlModule NO + #define AsmDefines -D__ELF__ -D__PIC__ #define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DHAS_ISW_FUNCS #define ServerExtraSysLibs $(CBRT) -lm -levent SCODynamicFlags Index: xc/config/imake/imake.c =================================================================== RCS file: /cvs/xorg/xc/config/imake/imake.c,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 imake.c --- xc/config/imake/imake.c 18 Apr 2004 03:00:42 -0000 1.1.4.4 +++ xc/config/imake/imake.c 18 Apr 2004 07:49:20 -0000 @@ -191,7 +191,7 @@ in this Software without prior written a #include #ifndef X_NOT_POSIX # ifdef _POSIX_SOURCE -# ifdef SCO325 +# ifdef __SCO__ # include # include # endif Index: xc/config/imake/imakemdep.h =================================================================== RCS file: /cvs/xorg/xc/config/imake/imakemdep.h,v retrieving revision 1.1.4.6 diff -u -3 -p -r1.1.4.6 imakemdep.h --- xc/config/imake/imakemdep.h 30 Mar 2004 14:23:10 -0000 1.1.4.6 +++ xc/config/imake/imakemdep.h 18 Apr 2004 07:49:20 -0000 @@ -73,7 +73,7 @@ in this Software without prior written a #ifdef imake_ccflags #undef imake_ccflags #endif -#define imake_ccflags "-Dsco -DSYSV -DSCO -DSCO325" +#define imake_ccflags "-DSYSV -DSCO325 -D__SCO__" #endif #ifdef sony @@ -199,7 +199,7 @@ in this Software without prior written a * descriptor onto another, define such a mechanism here (if you don't * already fall under the existing category(ies). */ -#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_) && !defined(sco) +#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_) && !defined(__SCO__) #define dup2(fd1,fd2) ((fd1 == fd2) ? fd1 : (close(fd2), \ fcntl(fd1, F_DUPFD, fd2))) #endif @@ -214,7 +214,7 @@ in this Software without prior written a * all colons). One way to tell if you need this is to see whether or not * your Makefiles have no tabs in them and lots of @@ strings. */ -#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(sco) || (defined(AMOEBA) && defined(CROSS_COMPILE)) || defined(__QNX__) || defined(__sgi) || defined(__UNIXOS2__) +#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(__SCO__) || (defined(AMOEBA) && defined(CROSS_COMPILE)) || defined(__QNX__) || defined(__sgi) || defined(__UNIXOS2__) #define FIXUP_CPP_WHITESPACE #endif #ifdef WIN32 @@ -482,8 +482,8 @@ char *cpp_argv[ARGUMENTS] = { "-DSVR4", # endif #endif /* MOTOROLA */ -#if defined(M_UNIX) || defined(sco) - "-Dsco", +#if defined(M_UNIX) || defined(sco) || defined(__SCO__) || defined(_SCO_DS) + "-D__SCO__", "-DSYSV", #endif #ifdef i386 @@ -509,11 +509,8 @@ char *cpp_argv[ARGUMENTS] = { # endif # endif # endif -# ifdef SCO - "-DSCO", -# ifdef _SCO_DS +# ifdef _SCO_DS "-DSCO325", -# endif # endif # endif # ifdef ESIX @@ -547,11 +544,8 @@ char *cpp_argv[ARGUMENTS] = { # endif # endif # endif -# ifdef SCO - "-DSCO", -# ifdef _SCO_DS +# ifdef _SCO_DS "-DSCO325", -# endif # endif # ifdef ESIX "-DESIX", Index: xc/extras/Mesa/include/GL/glxext.h =================================================================== RCS file: /cvs/xorg/xc/extras/Mesa/include/GL/glxext.h,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 glxext.h --- xc/extras/Mesa/include/GL/glxext.h 5 Mar 2004 13:38:28 -0000 1.1.4.4 +++ xc/extras/Mesa/include/GL/glxext.h 18 Apr 2004 07:49:21 -0000 @@ -322,7 +322,7 @@ typedef long int int32_t; typedef long long int int64_t; #endif -#if defined(SCO) || defined(__USLC__) +#if defined(__SCO__) || defined(__USLC__) #include #endif Index: xc/extras/freetype2/src/pcf/pcfutil.c =================================================================== RCS file: /cvs/xorg/xc/extras/freetype2/src/pcf/pcfutil.c,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 pcfutil.c --- xc/extras/freetype2/src/pcf/pcfutil.c 15 Apr 2004 10:14:37 -0000 1.1.4.3 +++ xc/extras/freetype2/src/pcf/pcfutil.c 18 Apr 2004 07:49:21 -0000 @@ -72,7 +72,7 @@ in this Software without prior written a * Invert bit order within each BYTE of an array. */ - void + static void BitOrderInvert( unsigned char* buf, int nbytes ) { @@ -88,7 +88,7 @@ in this Software without prior written a * Invert byte order within each 16-bits of an array. */ - void + static void TwoByteSwap( unsigned char* buf, int nbytes ) { @@ -107,7 +107,7 @@ in this Software without prior written a * Invert byte order within each 32-bits of an array. */ - void + static void FourByteSwap( unsigned char* buf, int nbytes ) { @@ -131,7 +131,7 @@ in this Software without prior written a * Repad a bitmap. */ - int + static int RepadBitmap( char* pSrc, char* pDst, unsigned int srcPad, Index: xc/extras/freetype2/src/pcf/pcfutil.h =================================================================== RCS file: /cvs/xorg/xc/extras/freetype2/src/pcf/pcfutil.h,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 pcfutil.h --- xc/extras/freetype2/src/pcf/pcfutil.h 15 Apr 2004 10:14:37 -0000 1.1.4.4 +++ xc/extras/freetype2/src/pcf/pcfutil.h 18 Apr 2004 07:49:21 -0000 @@ -31,19 +31,19 @@ THE SOFTWARE. #include - void + static void BitOrderInvert( unsigned char* buf, int nbytes); - void + static void TwoByteSwap( unsigned char* buf, int nbytes); - void + static void FourByteSwap( unsigned char* buf, int nbytes); - int + static int RepadBitmap( char* pSrc, char* pDst, unsigned int srcPad, Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/simplemath.h =================================================================== RCS file: /cvs/xorg/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/simplemath.h,v retrieving revision 1.1.4.1 diff -u -3 -p -r1.1.4.1 simplemath.h --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/simplemath.h 5 Mar 2004 13:38:44 -0000 1.1.4.1 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/simplemath.h 18 Apr 2004 07:49:23 -0000 @@ -50,7 +50,7 @@ max( int x, int y ) { return ( x < y ) ? inline REAL min( REAL x, REAL y ) { return ( x > y ) ? y : x; } -#ifdef _SCO_DS +#if defined(_SCO_DS) || defined(__SCO__) #define abs __gluabs #endif inline REAL Index: xc/include/Xfuncs.h =================================================================== RCS file: /cvs/xorg/xc/include/Xfuncs.h,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 Xfuncs.h --- xc/include/Xfuncs.h 5 Mar 2004 13:38:51 -0000 1.1.4.4 +++ xc/include/Xfuncs.h 18 Apr 2004 07:49:23 -0000 @@ -41,14 +41,14 @@ void bcopy(); void bzero(); int bcmp(); #else -#if defined(SYSV) && !defined(SCO325) && !defined(sun) +#if defined(SYSV) && !defined(__SCO__) && !defined(sun) #include void bcopy(); #define bzero(b,len) memset(b, 0, len) #define bcmp(b1,b2,len) memcmp(b1, b2, len) #else #include -#if defined(SCO325) || defined(sun) +#if defined(__SCO__) || defined(sun) #include #endif #define _XFUNCS_H_INCLUDED_STRING_H Index: xc/include/Xos.h =================================================================== RCS file: /cvs/xorg/xc/include/Xos.h,v retrieving revision 1.1.4.6 diff -u -3 -p -r1.1.4.6 Xos.h --- xc/include/Xos.h 5 Mar 2004 13:38:51 -0000 1.1.4.6 +++ xc/include/Xos.h 18 Apr 2004 07:49:23 -0000 @@ -62,7 +62,7 @@ in this Software without prior written a #endif /* USG */ #ifndef sgi -#if defined(SCO325) || defined(__USLC__) +#if defined(__SCO__) || defined(__USLC__) #include #endif #endif @@ -92,7 +92,7 @@ in this Software without prior written a #ifndef X_NOT_STDC_ENV #include -#ifdef SCO325 +#ifdef __SCO__ #include #else #if (defined(sun) && defined(__SVR4)) Index: xc/include/Xosdefs.h =================================================================== RCS file: /cvs/xorg/xc/include/Xosdefs.h,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 Xosdefs.h --- xc/include/Xosdefs.h 5 Mar 2004 13:38:51 -0000 1.1.4.3 +++ xc/include/Xosdefs.h 18 Apr 2004 07:49:23 -0000 @@ -81,18 +81,18 @@ in this Software without prior written a #endif #ifdef _SCO_DS -#ifndef SCO -#define SCO -#endif #ifndef SCO325 #define SCO325 #endif +#ifndef __SCO__ +#define __SCO__ +#endif #endif #ifdef i386 #ifdef SYSV -#if !defined(ISC) && !defined(SCO) && !defined(_SEQUENT_) -#if !defined(_POSIX_SOURCE) && !defined(_SCO_DS) +#if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) +#if !defined(_POSIX_SOURCE) && !defined(__SCO__) #define X_NOT_POSIX #endif #define X_NOT_STDC_ENV Index: xc/lib/FS/FSlibos.h =================================================================== RCS file: /cvs/xorg/xc/lib/FS/FSlibos.h,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 FSlibos.h --- xc/lib/FS/FSlibos.h 5 Mar 2004 13:38:53 -0000 1.1.4.4 +++ xc/lib/FS/FSlibos.h 18 Apr 2004 07:49:23 -0000 @@ -62,7 +62,7 @@ in this Software without prior written a #ifndef WIN32 -#if defined(SCO) || defined(__USLC__) +#if defined(__SCO__) || defined(__USLC__) #include /* For SIZE_MAX */ #endif Index: xc/lib/X11/Xlib.h =================================================================== RCS file: /cvs/xorg/xc/lib/X11/Xlib.h,v retrieving revision 1.1.4.9 diff -u -3 -p -r1.1.4.9 Xlib.h --- xc/lib/X11/Xlib.h 15 Apr 2004 10:14:54 -0000 1.1.4.9 +++ xc/lib/X11/Xlib.h 18 Apr 2004 07:49:24 -0000 @@ -53,7 +53,7 @@ in this Software without prior written a #endif #endif /* USG */ -#if defined(SCO325) || defined(__USLC__) +#if defined(__SCO__) || defined(__USLC__) #include #endif @@ -65,13 +65,11 @@ in this Software without prior written a #ifndef X_WCHAR #ifdef X_NOT_STDC_ENV -#ifndef SCO324 #ifndef ISC #define X_WCHAR #endif #endif #endif -#endif #ifndef X_WCHAR #include Index: xc/lib/Xaw/XawI18n.h =================================================================== RCS file: /cvs/xorg/xc/lib/Xaw/XawI18n.h,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 XawI18n.h --- xc/lib/Xaw/XawI18n.h 5 Mar 2004 13:39:20 -0000 1.1.4.3 +++ xc/lib/Xaw/XawI18n.h 18 Apr 2004 07:49:24 -0000 @@ -42,7 +42,7 @@ in this Software without prior written a #include #endif -#if defined(AIXV3) || defined(SCO325) +#if defined(AIXV3) || defined(__SCO__) #include #endif Index: xc/lib/Xbsd/Berklib.c =================================================================== RCS file: /cvs/xorg/xc/lib/Xbsd/Berklib.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 Berklib.c --- xc/lib/Xbsd/Berklib.c 5 Mar 2004 13:39:21 -0000 1.1.4.2 +++ xc/lib/Xbsd/Berklib.c 18 Apr 2004 07:49:24 -0000 @@ -52,7 +52,7 @@ from The Open Group. #define WANT_RANDOM #endif -#if defined(SVR4) && !defined(SCO325) +#if defined(SVR4) && !defined(__SCO__) && !defined(__USLC__) #define WANT_BFUNCS #define WANT_FFS #define WANT_RANDOM @@ -64,7 +64,7 @@ from The Open Group. #ifdef SYSV #ifdef i386 -#ifndef SCO +#ifndef __SCO__ #define WANT_FFS #define WANT_MEMMOVE #endif Index: xc/lib/Xt/NextEvent.c =================================================================== RCS file: /cvs/xorg/xc/lib/Xt/NextEvent.c,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 NextEvent.c --- xc/lib/Xt/NextEvent.c 5 Mar 2004 13:39:28 -0000 1.1.4.3 +++ xc/lib/Xt/NextEvent.c 18 Apr 2004 07:49:24 -0000 @@ -77,7 +77,7 @@ static SignalEventRec* freeSignalRecs; */ #ifndef NEEDS_NTPD_FIXUP -# if defined(sun) || defined(MOTOROLA) || defined(sco324) || (defined(__osf__) && defined(__alpha)) +# if defined(sun) || defined(MOTOROLA) || (defined(__osf__) && defined(__alpha)) # define NEEDS_NTPD_FIXUP 1 # else # define NEEDS_NTPD_FIXUP 0 Index: xc/lib/Xxf86dga/XF86DGA.c =================================================================== RCS file: /cvs/xorg/xc/lib/Xxf86dga/XF86DGA.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 XF86DGA.c --- xc/lib/Xxf86dga/XF86DGA.c 5 Mar 2004 13:39:30 -0000 1.1.4.2 +++ xc/lib/Xxf86dga/XF86DGA.c 18 Apr 2004 07:49:24 -0000 @@ -373,7 +373,7 @@ Bool XF86DGAViewPortChanged( #include #include -#if defined(SVR4) && !defined(sun) && !defined(SCO325) +#if defined(SVR4) && !defined(sun) && !defined(__SCO__) #define DEV_MEM "/dev/pmem" #elif defined(SVR4) && defined(sun) #define DEV_MEM "/dev/xsvc" Index: xc/lib/Xxf86dga/XF86DGA2.c =================================================================== RCS file: /cvs/xorg/xc/lib/Xxf86dga/XF86DGA2.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 XF86DGA2.c --- xc/lib/Xxf86dga/XF86DGA2.c 5 Mar 2004 13:39:30 -0000 1.1.4.2 +++ xc/lib/Xxf86dga/XF86DGA2.c 18 Apr 2004 07:49:24 -0000 @@ -742,7 +742,7 @@ void XDGAKeyEventToXKeyEvent( #include #include -#if defined(SVR4) && !defined(sun) && !defined(SCO325) +#if defined(SVR4) && !defined(sun) && !defined(__SCO__) #define DEV_MEM "/dev/pmem" #elif defined(SVR4) && defined(sun) #define DEV_MEM "/dev/xsvc" Index: xc/lib/dps/Xlibnet.h =================================================================== RCS file: /cvs/xorg/xc/lib/dps/Xlibnet.h,v retrieving revision 1.1.4.1 diff -u -3 -p -r1.1.4.1 Xlibnet.h --- xc/lib/dps/Xlibnet.h 5 Mar 2004 13:39:31 -0000 1.1.4.1 +++ xc/lib/dps/Xlibnet.h 18 Apr 2004 07:49:24 -0000 @@ -58,7 +58,7 @@ without express or implied warranty. #endif #if defined(i386) && defined(SYSV) -#if !defined(SCO) && !defined(SCO325) +#if !defined(__SCO__) #include #endif #include @@ -273,7 +273,7 @@ extern Xstream _XsStream[]; #ifndef USL_COMPAT #if !defined(USG) || defined(MOTOROLA) -#if (defined(SCO) || defined(SCO325)) || (!(defined(SYSV) && defined(i386))) +#if (defined(__SCO__)) || (!(defined(SYSV) && defined(i386))) #define _XReadV readv #endif #define _XWriteV writev Index: xc/lib/dps/cslibint.h =================================================================== RCS file: /cvs/xorg/xc/lib/dps/cslibint.h,v retrieving revision 1.1.4.1 diff -u -3 -p -r1.1.4.1 cslibint.h --- xc/lib/dps/cslibint.h 5 Mar 2004 13:39:31 -0000 1.1.4.1 +++ xc/lib/dps/cslibint.h 18 Apr 2004 07:49:24 -0000 @@ -65,7 +65,7 @@ /* For SYSV, no gethostname, so fake it */ #include -#if defined(SCO) || defined(SCO325) +#if defined(__SCO__) /* SCO systems define MAXHOSTNAMELEN here */ #include #endif Index: xc/lib/font/fc/fslibos.h =================================================================== RCS file: /cvs/xorg/xc/lib/font/fc/fslibos.h,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 fslibos.h --- xc/lib/font/fc/fslibos.h 5 Mar 2004 13:39:38 -0000 1.1.4.3 +++ xc/lib/font/fc/fslibos.h 18 Apr 2004 07:49:24 -0000 @@ -65,7 +65,7 @@ from The Open Group. #endif #ifndef OPEN_MAX #if defined(SVR4) || defined(__UNIXOS2__) -#ifdef SCO325 +#ifdef __SCO__ #define OPEN_MAX sysconf(_SC_OPEN_MAX) #else #define OPEN_MAX 256 Index: xc/lib/font/fontfile/encparse.c =================================================================== RCS file: /cvs/xorg/xc/lib/font/fontfile/encparse.c,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 encparse.c --- xc/lib/font/fontfile/encparse.c 5 Mar 2004 13:39:38 -0000 1.1.4.3 +++ xc/lib/font/fontfile/encparse.c 18 Apr 2004 07:49:25 -0000 @@ -32,7 +32,7 @@ THE SOFTWARE. #include #include -#ifdef SCO325 +#ifdef __SCO__ #include #endif Index: xc/lib/font/fontfile/fontenc.c =================================================================== RCS file: /cvs/xorg/xc/lib/font/fontfile/fontenc.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 fontenc.c --- xc/lib/font/fontfile/fontenc.c 5 Mar 2004 13:39:38 -0000 1.1.4.2 +++ xc/lib/font/fontfile/fontenc.c 18 Apr 2004 07:49:25 -0000 @@ -27,7 +27,7 @@ THE SOFTWARE. #include -#ifdef SCO325 +#ifdef __SCO__ #include #endif Index: xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c =================================================================== RCS file: /cvs/xorg/xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 lbx_zlib_io.c --- xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c 5 Mar 2004 13:39:43 -0000 1.1.4.2 +++ xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c 18 Apr 2004 07:49:25 -0000 @@ -44,7 +44,7 @@ * The following is taken from the xtrans code, almost as is, * it would be nice to share it... */ -#if defined(WIN32) || defined(__sxg__) || (defined(SCO) && !defined(SVR4) && !defined(SCO325)) +#if defined(WIN32) || defined(__sxg__) static int writev(int fildes, const struct iovec *iov, int iovcnt) { Index: xc/lib/xtrans/Xtrans.c =================================================================== RCS file: /cvs/xorg/xc/lib/xtrans/Xtrans.c,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 Xtrans.c --- xc/lib/xtrans/Xtrans.c 5 Mar 2004 13:39:44 -0000 1.1.4.4 +++ xc/lib/xtrans/Xtrans.c 18 Apr 2004 07:49:25 -0000 @@ -117,7 +117,7 @@ Xtransport_table Xtransports[] = { { &TRANS(NAMEDFuncs), TRANS_LOCAL_NAMED_INDEX }, #endif #ifndef sun -#ifndef SCO325 +#ifndef __SCO__ { &TRANS(ISCFuncs), TRANS_LOCAL_ISC_INDEX }, #endif { &TRANS(SCOFuncs), TRANS_LOCAL_SCO_INDEX }, @@ -712,7 +712,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, break; case 1: /* Set to non-blocking mode */ -#if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(hpux) && !defined(AIXV3) && !defined(uniosu) && !defined(__UNIXOS2__) && !defined(SCO)) && !defined(__QNX__) +#if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(hpux) && !defined(AIXV3) && !defined(uniosu) && !defined(__UNIXOS2__) && !defined(SCO325)) && !defined(__QNX__) ret = fcntl (fd, F_GETFL, 0); if (ret != -1) ret = fcntl (fd, F_SETFL, ret | O_NONBLOCK); @@ -1299,7 +1299,7 @@ static int TRANS(WriteV) (XtransConnInfo #endif /* CRAY */ -#if (defined(SYSV) && defined(i386) && !defined(SCO325)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__) +#if (defined(SYSV) && defined(i386) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__) /* * emulate readv @@ -1331,7 +1331,7 @@ static int TRANS(ReadV) (XtransConnInfo #endif /* SYSV && i386 || WIN32 || __sxg__ */ -#if (defined(SYSV) && defined(i386) && !defined(SCO325)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__) +#if (defined(SYSV) && defined(i386) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__) /* * emulate writev @@ -1364,7 +1364,7 @@ static int TRANS(WriteV) (XtransConnInfo #endif /* SYSV && i386 || WIN32 || __sxg__ */ -#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO) +#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(__SCO__) #ifndef NEED_UTSNAME #define NEED_UTSNAME #endif Index: xc/lib/xtrans/Xtransint.h =================================================================== RCS file: /cvs/xorg/xc/lib/xtrans/Xtransint.h,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 Xtransint.h --- xc/lib/xtrans/Xtransint.h 5 Mar 2004 13:39:44 -0000 1.1.4.4 +++ xc/lib/xtrans/Xtransint.h 18 Apr 2004 07:49:25 -0000 @@ -110,7 +110,7 @@ from The Open Group. * to avoid a race condition. JKJ (6/5/97) */ -# if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(SCO) +# if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(__SCO__) # ifndef NEED_UTSNAME # define NEED_UTSNAME # endif @@ -383,7 +383,7 @@ typedef struct _Xtransport_table { * systems, so they may be emulated. */ -#if defined(CRAY) || (defined(SYSV) && defined(i386) && !defined(SCO325)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__) +#if defined(CRAY) || (defined(SYSV) && defined(i386) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__) #define READV(ciptr, iov, iovcnt) TRANS(ReadV)(ciptr, iov, iovcnt) @@ -400,7 +400,7 @@ static int TRANS(ReadV)( #endif /* CRAY || (SYSV && i386) || WIN32 || __sxg__ || */ -#if defined(CRAY) || (defined(SYSV) && defined(i386) && !defined(SCO325)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__) +#if defined(CRAY) || (defined(SYSV) && defined(i386) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__) #define WRITEV(ciptr, iov, iovcnt) TRANS(WriteV)(ciptr, iov, iovcnt) Index: xc/lib/xtrans/Xtranslcl.c =================================================================== RCS file: /cvs/xorg/xc/lib/xtrans/Xtranslcl.c,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 Xtranslcl.c --- xc/lib/xtrans/Xtranslcl.c 5 Mar 2004 13:39:44 -0000 1.1.4.3 +++ xc/lib/xtrans/Xtranslcl.c 18 Apr 2004 07:49:26 -0000 @@ -198,7 +198,7 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr /* PTS */ -#if defined(SYSV) && !defined(sco) && !defined(SCO) && !defined(ISC) +#if defined(SYSV) && !defined(sco) && !defined(__SCO__) && !defined(ISC) #define SIGNAL_T int #else #define SIGNAL_T void @@ -239,7 +239,7 @@ static void _dummy(int sig) #endif /* - * ISC and SCO are only defined for X11 since they are there for + * ISC is only defined for X11 since it is there for * backwards binary compatability only. */ @@ -252,6 +252,8 @@ static void _dummy(int sig) #if defined(XIM_t) #define PTSNODENAME "/dev/X/XIM." #define NAMEDNODENAME "/dev/X/NXIM." +#define SCORNODENAME "/dev/XIM.%sR" +#define SCOSNODENAME "/dev/XIM.%sS" #endif #if defined(FS_t) || defined (FONT_t) /* @@ -260,14 +262,20 @@ static void _dummy(int sig) */ #define PTSNODENAME "/dev/X/fontserver." #define NAMEDNODENAME "/dev/X/Nfontserver." +#define SCORNODENAME "/dev/fontserver.%sR" +#define SCOSNODENAME "/dev/fontserver.%sS" #endif #if defined(ICE_t) #define PTSNODENAME "/dev/X/ICE." #define NAMEDNODENAME "/dev/X/NICE." +#define SCORNODENAME "/dev/ICE.%sR" +#define SCOSNODENAME "/dev/ICE.%sS" #endif #if defined(TEST_t) #define PTSNODENAME "/dev/X/transtest." #define NAMEDNODENAME "/dev/X/Ntranstest." +#define SCORNODENAME "/dev/transtest.%sR" +#define SCOSNODENAME "/dev/transtest.%sS" #endif @@ -837,11 +845,8 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, #ifndef sun -/* SCO doesnt use the ISC transport type - it causes problems */ -#ifndef SCO325 - /* - * connect_spipe is used by the ISC connection type. + * connect_spipe is used by the SCO and ISC connection type. */ static int connect_spipe(int fd1, int fd2) @@ -866,7 +871,7 @@ connect_spipe(int fd1, int fd2) } /* - * named_spipe is used by ISC connection type. + * named_spipe is used by the SCO and ISC connection types. */ static int @@ -892,6 +897,9 @@ named_spipe(int fd, char *path) return(ret); } +/* SCO doesnt use the ISC transport type - it causes problems */ +#ifndef __SCO__ + /* ISC */ @@ -1176,7 +1184,7 @@ TRANS(ISCAccept)(XtransConnInfo ciptr, X } #endif /* TRANS_SERVER */ -#endif /* !SCO325 */ +#endif /* !__SCO__ */ /* SCO */ @@ -1188,6 +1196,12 @@ TRANS(ISCAccept)(XtransConnInfo ciptr, X * This greatly helps inter-operability between X11R6 and X11R5 (the native * SCO server). Mainly, it relies on streams nodes existing in /dev, not * creating them or unlinking them, which breaks the native X server. + * + * However, this is only for the X protocol. For all other protocols, we + * do in fact create the nodes, as only X11R6 will use them, and this makes + * it possible to have both types of clients running, otherwise we get all + * kinds of nasty errors on startup for anything that doesnt use the X + * protocol (like SM, when KDE starts up). */ #ifdef TRANS_CLIENT @@ -1205,10 +1219,13 @@ TRANS(SCOOpenClient)(XtransConnInfo cipt extern int getmsg(), putmsg(); #endif - PRMSG(2,"SCOOpenClient(%s)\n", port, 0,0 ); + PRMSG(2, "SCOOpenClient(%s)\n", port, 0,0 ); + + if (!port || !port[0]) + port = "0"; #if !defined(SCORNODENAME) - PRMSG(1,"SCOOpenClient: Protocol is not supported by a SCO connection\n", 0,0,0); + PRMSG(2,"SCOOpenClient: Protocol is not supported by a SCO connection\n", 0,0,0); return -1; #else (void) sprintf(server_path, SCORNODENAME, port); @@ -1258,11 +1275,12 @@ TRANS(SCOOpenClient)(XtransConnInfo cipt * Everything looks good: fill in the XtransConnInfo structure. */ +#ifdef X11_t ciptr->flags |= TRANS_NOUNLINK; +#endif if (TRANS(FillAddrInfo) (ciptr, server_path, server_path) == 0) { - PRMSG(1,"SCOOpenClient: failed to fill addr info\n", - 0,0,0); + PRMSG(1,"SCOOpenClient: failed to fill addr info\n", 0,0,0); close(fd); return -1; } @@ -1286,22 +1304,48 @@ TRANS(SCOOpenServer)(XtransConnInfo cipt struct flock mylock; int fdr = -1; int fds = -1; - long temp; - struct strfdinsert sbuf; #endif PRMSG(2,"SCOOpenServer(%s)\n", port, 0,0 ); + if (!port || !port[0]) + port = "0"; + #if !defined(SCORNODENAME) - PRMSG(1,"SCOOpenServer: Protocol is not supported by a SCO connection\n", 0,0,0); + PRMSG(2,"SCOOpenServer: Protocol is not supported by a SCO connection\n", 0,0,0); return -1; #else (void) sprintf(serverR_path, SCORNODENAME, port); (void) sprintf(serverS_path, SCOSNODENAME, port); +#ifndef X11_t + unlink(serverR_path); + unlink(serverS_path); + + if ((fds = open(DEV_SPX, O_RDWR)) < 0 || + (fdr = open(DEV_SPX, O_RDWR)) < 0 ) { + PRMSG(1,"SCOOpenServer: failed to open %s\n", DEV_SPX, 0,0 ); + return -1; + } + + if (named_spipe (fds, serverS_path) == -1) { + PRMSG(1,"SCOOpenServer: failed to create %s\n", serverS_path, 0, 0); + close (fdr); + close (fds); + return -1; + } + + if (named_spipe (fdr, serverR_path) == -1) { + PRMSG(1,"SCOOpenServer: failed to create %s\n", serverR_path, 0, 0); + close (fdr); + close (fds); + return -1; + } +#else /* X11_t */ + fds = open (serverS_path, O_RDWR | O_NDELAY); if (fds < 0) { - PRMSG(1,"SCOOpenServer: failed to open %s", serverS_path, 0, 0); + PRMSG(1,"SCOOpenServer: failed to open %s\n", serverS_path, 0, 0); return -1; } @@ -1314,30 +1358,22 @@ TRANS(SCOOpenServer)(XtransConnInfo cipt mylock.l_start = 0; mylock.l_len = 0; if (fcntl (fds, F_SETLK, &mylock) < 0) { - PRMSG(1,"SCOOpenServer: failed to lock %s", serverS_path, 0, 0); + PRMSG(1,"SCOOpenServer: failed to lock %s\n", serverS_path, 0, 0); close (fds); return -1; } fdr = open (serverR_path, O_RDWR | O_NDELAY); if (fds < 0) { - PRMSG(1,"SCOOpenServer: failed to open %s", serverR_path, 0, 0); + PRMSG(1,"SCOOpenServer: failed to open %s\n", serverR_path, 0, 0); close (fds); return -1; } +#endif /* X11_t */ - sbuf.databuf.maxlen = 0; - sbuf.databuf.len = -1; - sbuf.databuf.buf = NULL; - sbuf.ctlbuf.maxlen = sizeof(long); - sbuf.ctlbuf.len = sizeof(long); - sbuf.ctlbuf.buf = (caddr_t)&temp; - sbuf.offset = 0; - sbuf.flags = 0; - sbuf.fildes = fdr; - - if (ioctl(fds, I_FDINSERT, &sbuf) < 0) { - PRMSG(1,"SCOOpenServer: ioctl(I_FDINSERT) failed on %s", serverS_path, 0, 0); + if (connect_spipe(fds, fdr)) { + PRMSG(1,"SCOOpenServer: ioctl(I_FDINSERT) failed on %s\n", + serverS_path, 0, 0); close (fdr); close (fds); return -1; @@ -1347,7 +1383,9 @@ TRANS(SCOOpenServer)(XtransConnInfo cipt * Everything looks good: fill in the XtransConnInfo structure. */ +#ifdef X11_t ciptr->flags |= TRANS_NOUNLINK; +#endif if (TRANS(FillAddrInfo) (ciptr, serverS_path, serverR_path) == 0) { PRMSG(1,"SCOOpenServer: failed to fill in addr info\n", 0,0,0); close(fds); @@ -1365,35 +1403,23 @@ TRANS(SCOAccept)(XtransConnInfo ciptr, X { char c; int fd; - long temp; - struct strfdinsert sbuf; PRMSG(2,"SCOAccept(%d)\n", ciptr->fd, 0,0 ); if (read(ciptr->fd, &c, 1) < 0) { - PRMSG(1,"SCOAccept: can't read from client",0,0,0); + PRMSG(1,"SCOAccept: can't read from client\n",0,0,0); *status = TRANS_ACCEPT_MISC_ERROR; return(-1); } if( (fd = open(DEV_SPX, O_RDWR)) < 0 ) { - PRMSG(1,"SCOAccept: can't open \"%s\"",DEV_SPX, 0,0 ); + PRMSG(1,"SCOAccept: can't open \"%s\"\n",DEV_SPX, 0,0 ); *status = TRANS_ACCEPT_MISC_ERROR; return(-1); } - sbuf.databuf.maxlen = 0; - sbuf.databuf.len = -1; - sbuf.databuf.buf = NULL; - sbuf.ctlbuf.maxlen = sizeof(long); - sbuf.ctlbuf.len = sizeof(long); - sbuf.ctlbuf.buf = (caddr_t)&temp; - sbuf.offset = 0; - sbuf.flags = 0; - sbuf.fildes = fd; - - if (ioctl(ciptr->fd, I_FDINSERT, &sbuf) < 0) { - PRMSG(1,"SCOAccept: ioctl(I_FDINSERT) failed", 0, 0, 0); + if (connect_spipe (ciptr->fd, fd) < 0) { + PRMSG(1,"SCOAccept: ioctl(I_FDINSERT) failed\n", 0, 0, 0); close (fd); *status = TRANS_ACCEPT_MISC_ERROR; return -1; @@ -1517,7 +1543,7 @@ TRANS(NAMEDReopenServer)(XtransConnInfo } #ifndef sun -#ifndef SCO325 +#ifndef __SCO__ static int TRANS(ISCReopenServer)(XtransConnInfo ciptr, int fd, char *port) @@ -1545,7 +1571,7 @@ TRANS(ISCReopenServer)(XtransConnInfo ci #endif /* !ISCDEVNODENAME */ } -#endif /* !SCO325 */ +#endif /* !__SCO__ */ static int TRANS(SCOReopenServer)(XtransConnInfo ciptr, int fd, char *port) @@ -1557,14 +1583,19 @@ TRANS(SCOReopenServer)(XtransConnInfo ci PRMSG(2,"SCOReopenServer(%s)\n", port, 0,0 ); + if (!port || !port[0]) + port = "0"; + #if !defined(SCORNODENAME) - PRMSG(1,"SCOReopenServer: Protocol is not supported by a SCO connection\n", 0,0,0); + PRMSG(2,"SCOReopenServer: Protocol is not supported by a SCO connection\n", 0,0,0); return 0; #else (void) sprintf(serverR_path, SCORNODENAME, port); (void) sprintf(serverS_path, SCOSNODENAME, port); +#ifdef X11_t ciptr->flags |= TRANS_NOUNLINK; +#endif if (TRANS(FillAddrInfo) (ciptr, serverS_path, serverR_path) == 0) { PRMSG(1, "SCOReopenServer: failed to fill in addr info\n", 0,0,0); @@ -1786,7 +1817,7 @@ static LOCALtrans2dev LOCALtrans2devtab[ #endif /* SVR4 */ #ifndef sun -#ifndef SCO325 +#ifndef __SCO__ {"isc", #ifdef TRANS_CLIENT TRANS(ISCOpenClient), @@ -1808,7 +1839,7 @@ static LOCALtrans2dev LOCALtrans2devtab[ TRANS(ISCAccept) #endif /* TRANS_SERVER */ }, -#endif /* !SCO325 */ +#endif /* !__SCO__ */ {"sco", #ifdef TRANS_CLIENT @@ -1840,7 +1871,7 @@ static char *XLOCAL=NULL; static char *workingXLOCAL=NULL; static char *freeXLOCAL=NULL; -#ifdef SCO325 +#ifdef __SCO__ #define DEF_XLOCAL "SCO:UNIX:PTS" #else #define DEF_XLOCAL "UNIX:PTS:NAMED:ISC:SCO" @@ -2391,7 +2422,7 @@ TRANS(LocalBytesReadable)(XtransConnInfo { PRMSG(2,"LocalBytesReadable(%x->%d,%x)\n", ciptr, ciptr->fd, pend); -#if defined(ISC) || defined(SCO) +#if defined(ISC) || defined(SCO325) return ioctl(ciptr->fd, I_NREAD, (char *)pend); #else return ioctl(ciptr->fd, FIONREAD, (char *)pend); @@ -2502,7 +2533,7 @@ static char * local_aliases[] = { # endif "named", # ifndef sun -# ifndef SCO325 +# ifndef __SCO__ "isc", # endif "sco", @@ -2635,7 +2666,7 @@ Xtransport TRANS(NAMEDFuncs) = { }; #ifndef sun -#ifndef SCO325 +#ifndef __SCO__ Xtransport TRANS(ISCFuncs) = { /* Local Interface */ "isc", @@ -2675,7 +2706,7 @@ Xtransport TRANS(ISCFuncs) = { TRANS(LocalClose), TRANS(LocalCloseForCloning), }; -#endif /* !SCO325 */ +#endif /* !__SCO__ */ Xtransport TRANS(SCOFuncs) = { /* Local Interface */ "sco", Index: xc/lib/xtrans/Xtranssock.c =================================================================== RCS file: /cvs/xorg/xc/lib/xtrans/Xtranssock.c,v retrieving revision 1.1.4.8 diff -u -3 -p -r1.1.4.8 Xtranssock.c --- xc/lib/xtrans/Xtranssock.c 15 Apr 2004 10:15:12 -0000 1.1.4.8 +++ xc/lib/xtrans/Xtranssock.c 18 Apr 2004 07:49:26 -0000 @@ -99,15 +99,15 @@ from the copyright holders. #endif /* !NO_TCP_H */ #include -#if defined(SVR4) && !defined(SCO325) && !defined(DGUX) && !defined(_SEQUENT_) +#if defined(SVR4) && !defined(__SCO__) && !defined(DGUX) && !defined(_SEQUENT_) #include #endif -#if (defined(i386) && defined(SYSV)) && !defined(sco) && !defined(sun) +#if (defined(i386) && defined(SYSV)) && !defined(__SCO__) && !defined(sun) #include #endif -#if (defined(i386) && defined(SYSV)) && (!defined(ISC) || !defined(I_NREAD) || defined(SCO325)) || defined(_SEQUENT_) +#if (defined(i386) && defined(SYSV)) && (!defined(ISC) || !defined(I_NREAD) || defined(__SCO__)) || defined(_SEQUENT_) #include #endif @@ -324,7 +324,7 @@ TRANS(SocketINETGetAddr) (XtransConnInfo #endif struct sockaddr_in socknamev4; void *socknamePtr; -#if defined(SVR4) || defined(SCO325) +#if defined(SVR4) || defined(__SCO__) size_t namelen; #else int namelen; @@ -396,7 +396,7 @@ TRANS(SocketINETGetPeerAddr) (XtransConn #endif struct sockaddr_in socknamev4; void *socknamePtr; -#if defined(SVR4) || defined(SCO325) +#if defined(SVR4) || defined(__SCO__) size_t namelen; #else int namelen; @@ -1152,7 +1152,7 @@ TRANS(SocketUNIXResetListener) (XtransCo if (stat (unsock->sun_path, &statb) == -1 || ((statb.st_mode & S_IFMT) != -#if (defined (sun) && defined(SVR4)) || defined(NCR) || defined(SCO) || defined(sco) || !defined(S_IFSOCK) +#if (defined (sun) && defined(SVR4)) || defined(NCR) || defined(__SCO__) || !defined(S_IFSOCK) S_IFIFO)) #else S_IFSOCK)) @@ -1294,7 +1294,7 @@ TRANS(SocketUNIXAccept) (XtransConnInfo { XtransConnInfo newciptr; struct sockaddr_un sockname; -#if defined(SVR4) || defined(SCO325) +#if defined(SVR4) || defined(__SCO__) size_t namelen = sizeof sockname; #else int namelen = sizeof sockname; @@ -1971,7 +1971,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo return TRANS_CONNECT_FAILED; } -#if defined(BSD44SOCKETS) && !defined(Lynx) +#if (defined(BSD44SOCKETS) ||defined(USL)) && !defined(Lynx) sockname.sun_len = strlen (sockname.sun_path); namelen = SUN_LEN (&sockname); #else @@ -2083,7 +2083,7 @@ TRANS(SocketBytesReadable) (XtransConnIn #ifdef WIN32 return ioctlsocket ((SOCKET) ciptr->fd, FIONREAD, (u_long *) pend); #else -#if (defined(i386) && defined(SYSV) && !defined(sco)) || (defined(_SEQUENT_) && _SOCKET_VERSION == 1) +#if (defined(i386) && defined(SYSV) && !defined(SCO325)) || (defined(_SEQUENT_) && _SOCKET_VERSION == 1) return ioctl (ciptr->fd, I_NREAD, (char *) pend); #else #if defined(__UNIXOS2__) Index: xc/lib/xtrans/Xtransutil.c =================================================================== RCS file: /cvs/xorg/xc/lib/xtrans/Xtransutil.c,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 Xtransutil.c --- xc/lib/xtrans/Xtransutil.c 15 Apr 2004 10:15:12 -0000 1.1.4.4 +++ xc/lib/xtrans/Xtransutil.c 18 Apr 2004 07:49:26 -0000 @@ -192,6 +192,13 @@ TRANS(ConvertAddress)(int *familyp, int } #endif /* defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN*/ +#if defined(__SCO__) && defined(LOCALCONN) + case 0: + { + *familyp=FamilyLocal; + break; + } +#endif default: PRMSG(1,"ConvertAddress: Unknown family type %d\n", Index: xc/programs/Xserver/Xext/xf86bigfont.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xf86bigfont.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 xf86bigfont.c --- xc/programs/Xserver/Xext/xf86bigfont.c 5 Mar 2004 13:39:51 -0000 1.1.4.2 +++ xc/programs/Xserver/Xext/xf86bigfont.c 18 Apr 2004 07:49:27 -0000 @@ -47,7 +47,7 @@ #ifdef SVR4 #include #endif -#if defined(ISC) || defined(__CYGWIN__) || defined(SCO) || defined(SCO325) +#if defined(ISC) || defined(__CYGWIN__) || defined(__SCO__) #include #include #endif Index: xc/programs/Xserver/Xprint/attributes.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/attributes.c,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 attributes.c --- xc/programs/Xserver/Xprint/attributes.c 5 Mar 2004 13:39:53 -0000 1.1.4.4 +++ xc/programs/Xserver/Xprint/attributes.c 18 Apr 2004 07:49:27 -0000 @@ -53,7 +53,7 @@ copyright holders. #include #include #include -#if (defined(sun) && defined(SVR4)) || (defined(SCO)) +#if (defined(sun) && defined(SVR4)) || (defined(__SCO__)) #include #endif Index: xc/programs/Xserver/hw/xfree86/common/compiler.h =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/compiler.h,v retrieving revision 1.1.4.7 diff -u -3 -p -r1.1.4.7 compiler.h --- xc/programs/Xserver/hw/xfree86/common/compiler.h 18 Apr 2004 03:00:42 -0000 1.1.4.7 +++ xc/programs/Xserver/hw/xfree86/common/compiler.h 18 Apr 2004 07:49:28 -0000 @@ -1572,8 +1572,8 @@ extern void outl(unsigned int a, unsigne # else # include "scoasm.h" # endif -# if !defined(__HIGHC__) && !defined(SCO325) && !defined(sgi) && \ - !defined(__SUNPRO_C) +# if (!defined(__HIGHC__) && !defined(sgi) && !defined(__SUNPRO_C)) \ + || (defined(__USLC__) && defined(SCO325)) # pragma asm partial_optimization outl # pragma asm partial_optimization outw # pragma asm partial_optimization outb Index: xc/programs/Xserver/hw/xfree86/common/scoasm.h =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/scoasm.h,v retrieving revision 1.1.4.1 diff -u -3 -p -r1.1.4.1 scoasm.h --- xc/programs/Xserver/hw/xfree86/common/scoasm.h 26 Nov 2003 22:48:57 -0000 1.1.4.1 +++ xc/programs/Xserver/hw/xfree86/common/scoasm.h 18 Apr 2004 07:49:28 -0000 @@ -31,7 +31,7 @@ * scoasm.h - used to define inline versions of certain functions which * do NOT appear in sys/inline.h. */ -#ifdef SCO325 +#if defined(SCO325) && defined(__USLC__) #ifndef _SCOASM_HDR_INC #define _SCOASM_HDR_INC @@ -136,4 +136,4 @@ asm int inb(port) } #endif /* _SCOASM_HDR_INC */ -#endif /* SCO325 */ +#endif /* SCO325 && __USLC__ */ Index: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 xf86Configure.c --- xc/programs/Xserver/hw/xfree86/common/xf86Configure.c 15 Apr 2004 10:16:09 -0000 1.1.4.3 +++ xc/programs/Xserver/hw/xfree86/common/xf86Configure.c 18 Apr 2004 07:49:28 -0000 @@ -71,7 +71,7 @@ Bool foundMouse = FALSE; #if defined(__UNIXOS2__) #define DFLT_MOUSE_DEV "mouse$" #define DFLT_MOUSE_PROTO "OS2Mouse" -#elif defined(SCO) +#elif defined(__SCO__) static char *DFLT_MOUSE_PROTO = "OSMouse"; #elif defined(QNX4) static char *DFLT_MOUSE_PROTO = "OSMouse"; @@ -285,7 +285,7 @@ configureInputSection (void) } #endif -#ifndef SCO +#ifndef __SCO__ fd = open(DFLT_MOUSE_DEV, 0); if (fd != -1) { foundMouse = TRUE; @@ -302,7 +302,7 @@ configureInputSection (void) mouse->inp_driver = "mouse"; mouse->inp_option_lst = xf86addNewOption(mouse->inp_option_lst, "Protocol", DFLT_MOUSE_PROTO); -#ifndef SCO +#ifndef __SCO__ mouse->inp_option_lst = xf86addNewOption(mouse->inp_option_lst, "Device", DFLT_MOUSE_DEV); #endif @@ -852,7 +852,7 @@ DoConfigure() #ifdef __UNIXOS2__ #define PATH_MAX 2048 #endif -#if defined(SCO) || defined(SCO325) +#if defined(__SCO__) #define PATH_MAX 1024 #endif const char* configfile = XF86CONFIGFILE".new"; @@ -976,13 +976,13 @@ DoConfigure() ErrorF("\n"); -#ifdef SCO +#ifdef __SCO__ ErrorF("\n"__XSERVERNAME__ " is using the kernel event driver to access the mouse.\n" "If you wish to use the internal "__XSERVERNAME__ "mouse drivers, please\n" "edit the file and correct the Device.\n"); -#else /* !SCO */ +#else /* !__SCO__ */ if (!foundMouse) { ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n" "Edit the file and correct the Device.\n"); @@ -995,7 +995,7 @@ DoConfigure() "the protocol.\n",DFLT_MOUSE_DEV); #endif } -#endif /* !SCO */ +#endif /* !__SCO__ */ if (xf86NumScreens > 1) { ErrorF("\n"__XSERVERNAME__ Index: xc/programs/Xserver/hw/xfree86/common/xf86Events.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 xf86Events.c --- xc/programs/Xserver/hw/xfree86/common/xf86Events.c 18 Apr 2004 03:00:42 -0000 1.1.4.4 +++ xc/programs/Xserver/hw/xfree86/common/xf86Events.c 18 Apr 2004 07:49:28 -0000 @@ -352,7 +352,7 @@ xf86ProcessActionEvent(ActionEvent actio case ACTION_SWITCHSCREEN: if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) { int vtno = *((int *) arg); -#ifdef SCO +#ifdef __SCO__ vtno--; #endif #if defined(QNX4) @@ -365,12 +365,12 @@ xf86ProcessActionEvent(ActionEvent actio break; case ACTION_SWITCHSCREEN_NEXT: if (VTSwitchEnabled && !xf86Info.dontVTSwitch) { -#if defined(SCO) /* Shouldn't this be true for (sun) && (i386) && (SVR4) ? */ +#if defined(__SCO__) /* Shouldn't this be true for (sun) && (i386) && (SVR4) ? */ if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0) #else if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno + 1) < 0) #endif -#if defined (SCO) || (defined(sun) && defined (i386) && defined (SVR4)) +#if defined (__SCO__) || (defined(sun) && defined (i386) && defined (SVR4)) if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, 0) < 0) #else if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, 1) < 0) @@ -774,7 +774,7 @@ special: break; #endif -#if defined(linux) || (defined(CSRG_BASED) && (defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT))) || defined(SCO) +#if defined(linux) || (defined(CSRG_BASED) && (defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT))) || defined(__SCO__) /* * Under Linux, the raw keycodes are consumed before the kernel * does any processing on them, so we must emulate the vt switching @@ -913,7 +913,7 @@ special: #endif /* USE_VT_SYSREQ */ -#ifdef SCO +#ifdef __SCO__ /* * With the console in raw mode, SCO will not switch consoles, * you get around this by activating the next console along, if @@ -928,7 +928,7 @@ special: xf86ProcessActionEvent(ACTION_SWITCHSCREEN_NEXT, NULL); return; } -#endif /* SCO */ +#endif /* __SCO__ */ #ifdef XKB } #endif @@ -1094,8 +1094,9 @@ special: Bool xf86CommonSpecialKey(int key, Bool down, int modifiers) { - if ((ModifierIsSet(ControlMask | AltMask)) || - (ModifierIsSet(ControlMask | AltLangMask))) { + if (!(ModifierIsSet(ShiftMask)) && + ((ModifierIsSet(ControlMask | AltMask)) || + (ModifierIsSet(ControlMask | AltLangMask)))) { switch (key) { case KEY_BackSpace: Index: xc/programs/Xserver/hw/xfree86/common/xf86Init.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v retrieving revision 1.1.4.6 diff -u -3 -p -r1.1.4.6 xf86Init.c --- xc/programs/Xserver/hw/xfree86/common/xf86Init.c 15 Apr 2004 10:16:09 -0000 1.1.4.6 +++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c 18 Apr 2004 07:49:29 -0000 @@ -871,7 +871,7 @@ InitOutput(ScreenInfo *pScreenInfo, int xf86EnterServerState(SETUP); } } -#ifdef SCO +#ifdef __SCO__ else { /* * Under SCO we must ack that we got the console at startup, @@ -884,7 +884,7 @@ InitOutput(ScreenInfo *pScreenInfo, int xf86Msg(X_WARNING, "VT_ACKACQ failed"); } } -#endif /* SCO */ +#endif /* __SCO__ */ for (i = 0; i < xf86NumScreens; i++) { xf86EnableAccess(xf86Screens[i]); Index: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 SCO.sgml --- xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml 15 Apr 2004 10:16:15 -0000 1.1.4.4 +++ xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml 18 Apr 2004 07:49:29 -0000 @@ -30,9 +30,9 @@ X11R&relvers, the following conditions m installed, if appropriate. Check the release notes for that update to see whether or not your current operating system requires this update. At least version OSS646B is required. If you are running - SCO OpenServer Release 5.0.7, you must have Maintenance Pack 1 installed. + SCO OpenServer Release 5.0.7, you must have Maintenance Pack 2 installed. Ensure that the "Graphics, Web and X11 Libraries" package is - installed. At least version 1.3.2Ag is required. You should always + installed. At least version 1.3.3Cc is required. You should always install the latest possible version of this supplement that is valid for your operating system release. From time to time this release is bundled with Maintenance Packs, so if you are running 5.0.7 or later, Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 vboard.c --- xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c 5 Mar 2004 13:40:30 -0000 1.1.4.2 +++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c 18 Apr 2004 07:49:29 -0000 @@ -9,7 +9,7 @@ #include "vloaduc.h" #include "vos.h" -#if defined(SCO) || defined(SCO325) +#if defined(__SCO__) #define PATH_MAX 1024 #endif Index: xc/programs/Xserver/hw/xfree86/loader/os.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/os.c,v retrieving revision 1.1.4.1 diff -u -3 -p -r1.1.4.1 os.c --- xc/programs/Xserver/hw/xfree86/loader/os.c 26 Nov 2003 22:49:01 -0000 1.1.4.1 +++ xc/programs/Xserver/hw/xfree86/loader/os.c 18 Apr 2004 07:49:30 -0000 @@ -46,7 +46,7 @@ #define OSNAME "lynxos" #elif defined(__GNU__) #define OSNAME "hurd" -#elif defined(SCO) +#elif defined(__SCO__) #define OSNAME "sco" #elif defined(DGUX) #define OSNAME "dgux" Index: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 xf86_OSlib.h --- xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h 5 Mar 2004 13:40:52 -0000 1.1.4.3 +++ xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h 18 Apr 2004 07:49:30 -0000 @@ -118,7 +118,7 @@ typedef signed long xf86ssize_t; # include # include # include -# if defined(SCO) || defined(ISC) +# if defined(__SCO__) || defined(ISC) # include # endif @@ -173,7 +173,7 @@ typedef signed long xf86ssize_t; # if !defined(sun) # include # endif -# if defined(SCO) +# if defined(SCO325) # include # include # include @@ -185,13 +185,13 @@ typedef signed long xf86ssize_t; # include # include # include -# endif /* SCO */ +# endif /* SCO325 */ # if !defined(VT_ACKACQ) # define VT_ACKACQ 2 # endif /* !VT_ACKACQ */ -# if defined(SCO) +# if defined(__SCO__) # include # define POSIX_TTY # endif /* SCO */ Index: xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h,v retrieving revision 1.1.4.1 diff -u -3 -p -r1.1.4.1 xf86_ansic.h --- xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h 26 Nov 2003 22:49:01 -0000 1.1.4.1 +++ xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h 18 Apr 2004 07:49:30 -0000 @@ -55,7 +55,7 @@ #if defined(XFree86LOADER) || defined(NEED_XF86_TYPES) -#if !defined(SYSV) && !defined(SVR4) && !defined(Lynx) || defined(SCO) +#if !defined(SYSV) && !defined(SVR4) && !defined(Lynx) || defined(__SCO__) #define HAVE_VSSCANF #define HAVE_VFSCANF #endif Index: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 sco_init.c --- xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c 5 Mar 2004 13:40:56 -0000 1.1.4.2 +++ xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c 18 Apr 2004 07:49:30 -0000 @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.13 2002/06/03 21:22:10 dawes Exp $ */ /* - * Copyright 2001 by J. Kean Johnston + * Copyright 2001-2004 by J. Kean Johnston * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -118,20 +118,33 @@ xf86OpenConsole() ErrorF("(using VT%02d device %s)\n\n", VTnum, vtdevice); + /* + * If we are using XDM, which should use the -crt option on startup + * to specify where to run, we will not have stdin and stdout open. + * If the server was started with startx, we will. The easiest way + * to deal with this is to always close fd 0 and 1, open the console + * device (yielding fd 0 or stdin) and then to dup it onto fd 1. + */ + if ((xf86Info.consoleFd = open(vtdevice, O_RDWR | O_NDELAY, 0)) < 0) { FatalError("xf86OpenConsole: Cannot open %s (%s)\n", vtdevice, strerror(errno)); } - /* Dispose of stdin and stdout */ - if (freopen(vtdevice, "r+", stdin) == (FILE *) NULL) { - FatalError("xf86OpenConsole: Cannot reopen stdin as %s (%s)\n", - vtdevice, strerror(errno)); + if (xf86Info.consoleFd != 0) { + close (0); + if (dup2 (xf86Info.consoleFd, 0) == -1) { + FatalError("xf86OpenConsole: Cannot reopen stdin as %s (%s)\n", + vtdevice, strerror(errno)); + } } - if (freopen(vtname, "r+", stdout) == (FILE *) NULL) { - FatalError("xf86OpenConsole: Cannot reopen stdout as %s (%s)\n", - vtdevice, strerror(errno)); + if (xf86Info.consoleFd != 1) { + close (1); + if (dup2 (xf86Info.consoleFd, 1) == -1) { + FatalError("xf86OpenConsole: Cannot reopen stdout as %s (%s)\n", + vtdevice, strerror(errno)); + } } /* Index: xc/programs/Xserver/hw/xfree86/vbe/vbe.h =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 vbe.h --- xc/programs/Xserver/hw/xfree86/vbe/vbe.h 5 Mar 2004 13:40:58 -0000 1.1.4.4 +++ xc/programs/Xserver/hw/xfree86/vbe/vbe.h 18 Apr 2004 07:49:30 -0000 @@ -60,7 +60,7 @@ typedef struct vbeControllerInfoBlock { CARD8 OemData[256]; } vbeControllerInfoRec, *vbeControllerInfoPtr; -#if defined(__GNUC__) || defined(SCO) || defined(__USLC__) || \ +#if defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) || \ defined(__SUNPRO_C) #pragma pack() /* All GCC versions recognise this syntax */ #else Index: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 mouse-cfg.c --- xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c 5 Mar 2004 13:41:01 -0000 1.1.4.2 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c 18 Apr 2004 07:49:30 -0000 @@ -58,7 +58,7 @@ static struct MouseProtocol { #ifdef __UNIXOS2__ {"OS2Mouse", MTYPE_AUTOMOUSE}, #endif -#ifdef SCO +#ifdef __SCO__ {"OsMouse", MTYPE_AUTOMOUSE}, #endif #ifdef WSCONS_SUPPORT Index: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 text-mode.c --- xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c 15 Apr 2004 10:17:16 -0000 1.1.4.3 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c 18 Apr 2004 07:49:31 -0000 @@ -32,7 +32,7 @@ #include #include #include -#ifdef _SCO_DS +#if defined(__SCO__) || defined(__USLC__) #include #else #include Index: xc/programs/Xserver/include/os.h =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/include/os.h,v retrieving revision 1.1.4.5 diff -u -3 -p -r1.1.4.5 os.h --- xc/programs/Xserver/include/os.h 15 Apr 2004 10:17:21 -0000 1.1.4.5 +++ xc/programs/Xserver/include/os.h 18 Apr 2004 07:49:31 -0000 @@ -93,7 +93,7 @@ typedef struct _NewClientRec *NewClientP #endif #ifndef IN_MODULE -#ifdef SCO +#ifdef __SCO__ #include #endif #include Index: xc/programs/Xserver/os/access.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/os/access.c,v retrieving revision 1.1.4.6 diff -u -3 -p -r1.1.4.6 access.c --- xc/programs/Xserver/os/access.c 17 Apr 2004 18:47:05 -0000 1.1.4.6 +++ xc/programs/Xserver/os/access.c 18 Apr 2004 07:49:32 -0000 @@ -80,9 +80,9 @@ SOFTWARE. #include #include -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(ISC) || defined(SCO) +#if defined(TCPCONN) || defined(STREAMSCONN) || defined(ISC) || defined(__SCO__) #include -#endif /* TCPCONN || STREAMSCONN || ISC || SCO */ +#endif /* TCPCONN || STREAMSCONN || ISC || __SCO__ */ #ifdef DNETCONN #include #include @@ -131,7 +131,7 @@ SOFTWARE. #endif /* hpux */ #ifdef SVR4 -#ifndef SCO +#ifndef SCO325 #include #endif #include Index: xc/programs/Xserver/os/osinit.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/os/osinit.c,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 osinit.c --- xc/programs/Xserver/os/osinit.c 5 Mar 2004 13:41:11 -0000 1.1.4.3 +++ xc/programs/Xserver/os/osinit.c 18 Apr 2004 07:49:32 -0000 @@ -65,7 +65,7 @@ SOFTWARE. #endif #endif -#if defined(Lynx) || defined(SCO) || defined(SCO325) +#if defined(Lynx) || defined(__SCO__) #include #endif @@ -110,7 +110,7 @@ OsInit(void) #ifdef XFree86LOADER xf86WrapperInit(); #endif -#if !defined(SCO) && !defined(__CYGWIN__) +#if defined(__CYGWIN__) && !defined(__SCO__) fclose(stdin); fclose(stdout); #endif Index: xc/programs/fonttosfnt/util.c =================================================================== RCS file: /cvs/xorg/xc/programs/fonttosfnt/util.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 util.c --- xc/programs/fonttosfnt/util.c 5 Mar 2004 13:41:13 -0000 1.1.4.2 +++ xc/programs/fonttosfnt/util.c 18 Apr 2004 07:49:32 -0000 @@ -56,7 +56,7 @@ THE SOFTWARE. #define GMTOFFMEMBER tm_gmtoff #endif -#ifdef SCO +#ifdef __SCO__ #define HAVE_TM_GMTOFF #define GMTOFFMEMBER tm_tzadj #endif Index: xc/programs/rgb/rgb.c =================================================================== RCS file: /cvs/xorg/xc/programs/rgb/rgb.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 rgb.c --- xc/programs/rgb/rgb.c 5 Mar 2004 13:41:17 -0000 1.1.4.2 +++ xc/programs/rgb/rgb.c 18 Apr 2004 07:49:32 -0000 @@ -37,7 +37,7 @@ from The Open Group. #ifdef NDBM #include #else -#if defined(SVR4) && !defined(SCO325) +#if defined(SVR4) && !defined(__SCO__) #include #else #include Index: xc/programs/rgb/showrgb.c =================================================================== RCS file: /cvs/xorg/xc/programs/rgb/showrgb.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 showrgb.c --- xc/programs/rgb/showrgb.c 5 Mar 2004 13:41:17 -0000 1.1.4.2 +++ xc/programs/rgb/showrgb.c 18 Apr 2004 07:49:32 -0000 @@ -32,7 +32,7 @@ in this Software without prior written a #ifdef NDBM #include #else -#if defined(SVR4) && !defined(SCO325) +#if defined(SVR4) && !defined(__SCO__) #include #else #include Index: xc/programs/xauth/gethost.c =================================================================== RCS file: /cvs/xorg/xc/programs/xauth/gethost.c,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 gethost.c --- xc/programs/xauth/gethost.c 5 Mar 2004 13:41:18 -0000 1.1.4.3 +++ xc/programs/xauth/gethost.c 18 Apr 2004 07:49:32 -0000 @@ -58,9 +58,9 @@ in this Software without prior written a #include #ifdef SYSV #ifdef i386 -#if !defined(sco) && !defined(sun) +#if !defined(SCO325) && !defined(sun) #include -#endif /* !sco && !sun */ +#endif /* !SCO325 && !sun */ #endif /* i386 */ #endif /* SYSV */ #endif /* !STREAMSCONN */ Index: xc/programs/xconsole/xconsole.c =================================================================== RCS file: /cvs/xorg/xc/programs/xconsole/xconsole.c,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 xconsole.c --- xc/programs/xconsole/xconsole.c 5 Mar 2004 13:41:19 -0000 1.1.4.3 +++ xc/programs/xconsole/xconsole.c 18 Apr 2004 07:49:33 -0000 @@ -889,7 +889,7 @@ get_pty(int *pty, int *tty, char *ttydev * sends the output to xconsole. */ -#ifdef SCO +#ifdef SCO325 #define OSM_DEVICE "/dev/error" #else #ifdef USL Index: xc/programs/xdm/auth.c =================================================================== RCS file: /cvs/xorg/xc/programs/xdm/auth.c,v retrieving revision 1.1.4.6 diff -u -3 -p -r1.1.4.6 auth.c --- xc/programs/xdm/auth.c 5 Mar 2004 13:41:21 -0000 1.1.4.6 +++ xc/programs/xdm/auth.c 18 Apr 2004 07:49:33 -0000 @@ -39,6 +39,7 @@ from The Open Group. */ #include +#include #include #include @@ -58,8 +59,7 @@ from The Open Group. # include #endif -#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || (defined(SYSV) && defined(i386)) -#define NEED_UTSNAME +#if defined(hpux) #include #endif @@ -73,9 +73,7 @@ from The Open Group. #ifdef SVR4 # include -# ifndef SCO325 # include -# endif # include #endif #ifdef __convex__ @@ -677,16 +675,6 @@ writeAddr ( saveEntry (auth); } -static void -DefineLocal (FILE *file, Xauth *auth) -{ - char displayname[100]; - char tmp_displayname[100]; - - strcpy(tmp_displayname, ""); - - /* stolen from xinit.c */ - /* Make sure this produces the same string as _XGetHostname in lib/X/XlibInt.c. * Otherwise, Xau will not be able to find your cookies in the Xauthority file. * @@ -694,47 +682,35 @@ DefineLocal (FILE *file, Xauth *auth) * to have sufficient information for interfacing to the network, * and so, you may be better off using gethostname (if it exists). */ +static void +DefineLocal (FILE *file, Xauth *auth) +{ + char displayname[100]; + int len = _XGetHostname (displayname, sizeof(displayname)); -#ifdef NEED_UTSNAME - - /* hpux: - * Why not use gethostname()? Well, at least on my system, I've had to - * make an ugly kernel patch to get a name longer than 8 characters, and - * uname() lets me access to the whole string (it smashes release, you - * see), whereas gethostname() kindly truncates it for me. - */ - { - struct utsname name; - - uname(&name); - snprintf(displayname, sizeof(displayname), "%s", name.nodename); - } - writeAddr (FamilyLocal, strlen (displayname), displayname, file, auth); - - snprintf(tmp_displayname, sizeof(tmp_displayname), "%s", displayname); -#endif - -#if (!defined(NEED_UTSNAME) || defined (hpux)) - /* AIXV3: - * In AIXV3, _POSIX_SOURCE is defined, but uname gives only first - * field of hostname. Thus, we use gethostname instead. - */ - +#if defined(hpux) /* * For HP-UX, HP's Xlib expects a fully-qualified domain name, which * is achieved by using gethostname(). For compatability, we must - * also still create the entry using uname() above. + * also still create the entry using uname(). */ - gethostname(displayname, sizeof(displayname)); + char tmp_displayname[100]; + struct utsname name; + + tmp_displayname[0] = 0; + uname(&name); + snprintf(tmp_displayname, sizeof(tmp_displayname), "%s", name.nodename); + writeAddr (FamilyLocal, strlen (tmp_displayname), tmp_displayname, + file, auth); /* - * If gethostname and uname both returned the same name, - * do not write a duplicate entry. + * If _XGetHostname() returned the same value as uname(), don't + * write a duplicate entry. */ if (strcmp (displayname, tmp_displayname)) - writeAddr (FamilyLocal, strlen (displayname), displayname, - file, auth); #endif + + writeAddr (FamilyLocal, len, displayname, file, auth); } #ifdef HAS_GETIFADDRS Index: xc/programs/xdm/chooser.c =================================================================== RCS file: /cvs/xorg/xc/programs/xdm/chooser.c,v retrieving revision 1.1.4.8 diff -u -3 -p -r1.1.4.8 chooser.c --- xc/programs/xdm/chooser.c 15 Apr 2004 10:17:40 -0000 1.1.4.8 +++ xc/programs/xdm/chooser.c 18 Apr 2004 07:49:33 -0000 @@ -75,7 +75,7 @@ in this Software without prior written a #include #endif -#if defined(SVR4) && !defined(SCO325) +#if defined(SVR4) #include #endif #if defined(SVR4) && defined(PowerMAX_OS) Index: xc/programs/xdm/dm.c =================================================================== RCS file: /cvs/xorg/xc/programs/xdm/dm.c,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 dm.c --- xc/programs/xdm/dm.c 5 Mar 2004 13:41:21 -0000 1.1.4.4 +++ xc/programs/xdm/dm.c 18 Apr 2004 07:49:34 -0000 @@ -73,7 +73,7 @@ from The Open Group. #endif -#if defined(SVR4) && !defined(SCO) && !defined(sun) +#if defined(SVR4) && !defined(__SCO__) && !defined(sun) extern FILE *fdopen(); #endif Index: xc/programs/xdm/resource.c =================================================================== RCS file: /cvs/xorg/xc/programs/xdm/resource.c,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 resource.c --- xc/programs/xdm/resource.c 5 Mar 2004 13:41:21 -0000 1.1.4.4 +++ xc/programs/xdm/resource.c 18 Apr 2004 07:49:34 -0000 @@ -237,7 +237,7 @@ struct dmResources { #if !defined(ARC4_RANDOM) { "randomFile", "RandomFile", DM_STRING, &randomFile, DEF_RANDOM_FILE} , -{ "prgndSocket", "PrngdSocket", DM_STRING, &prngdSocket, +{ "prngdSocket", "PrngdSocket", DM_STRING, &prngdSocket, DEF_PRNGD_SOCKET}, { "prngdPort", "PrngdPort", DM_INT, (char **) &prngdPort, DEF_PRNGD_PORT}, Index: xc/programs/xdm/session.c =================================================================== RCS file: /cvs/xorg/xc/programs/xdm/session.c,v retrieving revision 1.1.4.6 diff -u -3 -p -r1.1.4.6 session.c --- xc/programs/xdm/session.c 5 Mar 2004 13:41:21 -0000 1.1.4.6 +++ xc/programs/xdm/session.c 18 Apr 2004 07:49:34 -0000 @@ -911,7 +911,7 @@ systemEnv (struct display *d, char *user return env; } -#if (defined(Lynx) && !defined(HAS_CRYPT)) || defined(SCO) && !defined(SCO_USA) && !defined(_SCO_DS) +#if defined(Lynx) && !defined(HAS_CRYPT) char *crypt(char *s1, char *s2) { return(s2); Index: xc/programs/xdm/util.c =================================================================== RCS file: /cvs/xorg/xc/programs/xdm/util.c,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 util.c --- xc/programs/xdm/util.c 5 Mar 2004 13:41:21 -0000 1.1.4.3 +++ xc/programs/xdm/util.c 18 Apr 2004 07:49:34 -0000 @@ -245,7 +245,7 @@ CleanUpChild (void) setsid(); #else #if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) -#if !(defined(SVR4) && defined(i386)) || defined(SCO325) +#if !(defined(SVR4) && defined(i386)) setpgrp (); #endif #else Index: xc/programs/xfs/os/osdep.h =================================================================== RCS file: /cvs/xorg/xc/programs/xfs/os/osdep.h,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 osdep.h --- xc/programs/xfs/os/osdep.h 5 Mar 2004 13:41:27 -0000 1.1.4.2 +++ xc/programs/xfs/os/osdep.h 18 Apr 2004 07:49:34 -0000 @@ -74,17 +74,16 @@ in this Software without prior written a #define OPEN_MAX 256 #else #ifdef SVR4 -#ifdef SCO324 -#define OPEN_MAX sysconf(_SC_OPEN_MAX) -#else #define OPEN_MAX 128 -#endif #else #include #ifdef __GNU__ #define OPEN_MAX (sysconf(_SC_OPEN_MAX)) #endif /*__GNU__*/ #ifndef OPEN_MAX +#ifdef SCO325 +#define OPEN_MAX (sysconf(_SC_OPEN_MAX)) +#else #if defined(NOFILE) && !defined(NOFILES_MAX) #define OPEN_MAX NOFILE #else @@ -94,8 +93,9 @@ in this Software without prior written a #endif #endif #endif +#endif -#ifdef __GNU__ +#if defined(__GNU__) || defined(SCO325) #define MAXSOCKS 128 #else /*__GNU__*/ #if OPEN_MAX <= 128 /* 128 is value of MAXCLIENTS */ Index: xc/programs/xinit/startx.cpp =================================================================== RCS file: /cvs/xorg/xc/programs/xinit/startx.cpp,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 startx.cpp --- xc/programs/xinit/startx.cpp 5 Mar 2004 13:41:28 -0000 1.1.4.3 +++ xc/programs/xinit/startx.cpp 18 Apr 2004 07:49:34 -0000 @@ -13,7 +13,7 @@ XCOMM Site administrators are STRONGLY u XCOMM XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $ -#ifdef SCO +#ifdef __SCO__ XCOMM Check for /usr/bin/X11 and BINDIR in the path, if not add them. XCOMM This allows startx to be placed in a place like /usr/bin or /usr/local/bin Index: xc/programs/xman/man.c =================================================================== RCS file: /cvs/xorg/xc/programs/xman/man.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 man.c --- xc/programs/xman/man.c 5 Mar 2004 13:41:37 -0000 1.1.4.2 +++ xc/programs/xman/man.c 18 Apr 2004 07:49:35 -0000 @@ -436,7 +436,7 @@ ReadCurrentSection(Manual * local_manual */ if ( (ptr = rindex(path, '.')) != NULL) { -#if !defined(SCO) && !defined(ISC) +#if !defined(__SCO__) && !defined(ISC) if (streq(ptr + 1, COMPRESSION_EXTENSION)) #else if (strpbrk(ptr + 1, COMPRESSION_EXTENSIONS) != NULL) @@ -474,7 +474,7 @@ ReadCurrentSection(Manual * local_manual */ if ( (ptr = rindex(full_name, '.')) != NULL) { -#if !defined(SCO) && !defined(ISC) +#if !defined(__SCO__) && !defined(ISC) if (streq(ptr + 1, COMPRESSION_EXTENSION)) #else if (strpbrk(ptr + 1, COMPRESSION_EXTENSIONS) != NULL) Index: xc/programs/xman/misc.c =================================================================== RCS file: /cvs/xorg/xc/programs/xman/misc.c,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 misc.c --- xc/programs/xman/misc.c 5 Mar 2004 13:41:37 -0000 1.1.4.2 +++ xc/programs/xman/misc.c 18 Apr 2004 07:49:35 -0000 @@ -61,7 +61,7 @@ static Boolean UncompressUnformatted(Man static Boolean ConstructCommand(char * cmdbuf, char * path, char * filename, char * tempfile); #endif -#if defined(ISC) || defined(SCO) +#if defined(ISC) || defined(__SCO__) static char *uncompress_format = NULL; static char *uncompress_formats[] = { UNCOMPRESS_FORMAT_1, @@ -185,7 +185,7 @@ FindManualFile(ManpageGlobals * man_glob char filename[BUFSIZ]; char * entry = manual[section_num].entries[entry_num]; int len_cat = strlen(CAT); -#if defined(ISC) || defined(SCO) +#if defined(ISC) || defined(__SCO__) int i; #endif @@ -214,7 +214,7 @@ FindManualFile(ManpageGlobals * man_glob * Then for compressed files in an uncompressed directory. */ -#if !defined(ISC) && !defined(SCO) +#if !defined(ISC) && !defined(__SCO__) #if defined(__OpenBSD__) || defined(__NetBSD__) /* look in machine subdir first */ sprintf(filename, "%s/%s%s/%s/%s.%s", path, CAT, Index: xc/programs/xman/vendor.c =================================================================== RCS file: /cvs/xorg/xc/programs/xman/vendor.c,v retrieving revision 1.1.4.1 diff -u -3 -p -r1.1.4.1 vendor.c --- xc/programs/xman/vendor.c 5 Mar 2004 13:41:37 -0000 1.1.4.1 +++ xc/programs/xman/vendor.c 18 Apr 2004 07:49:35 -0000 @@ -55,7 +55,7 @@ static SectionNameRec SectionNames[] = { {"(l) Local", "l"}, {"(n) New", "n"}, {"(o) Old", "o"} -#ifdef SCO +#ifdef __SCO__ , { "(ADM) System Administration", "ADM" }, { "(ADMN) Network Administration", "ADMN" }, Index: xc/programs/xman/vendor.h =================================================================== RCS file: /cvs/xorg/xc/programs/xman/vendor.h,v retrieving revision 1.1.4.2 diff -u -3 -p -r1.1.4.2 vendor.h --- xc/programs/xman/vendor.h 5 Mar 2004 13:41:37 -0000 1.1.4.2 +++ xc/programs/xman/vendor.h 18 Apr 2004 07:49:35 -0000 @@ -94,8 +94,8 @@ from the X Consortium. */ #if defined( macII ) || defined( hcx ) || \ - (defined(SYSV) && defined(i386) && !defined(ISC) && !defined(SCO)) || \ - defined(sgi) + (defined(SYSV) && defined(i386) && !defined(ISC) && \ + !defined(__SCO__)) || defined(sgi) # define COMPRESSION_EXTENSION "z" # define UNCOMPRESS_FORMAT "pcat %s > %s" # define NO_COMPRESS /* mac can't handle using pack as a filter and @@ -104,9 +104,9 @@ from the X Consortium. # define COMPRESSION_EXTENSION "C" # define UNCOMPRESS_FORMAT "ccat < %s > %s" # define COMPRESS "compact" -#elif defined (ISC) || defined(SCO) +#elif defined (ISC) || defined(__SCO__) # define COMPRESSION_EXTENSION "Z" /* dummy */ -# ifndef SCO +# ifndef __SCO__ # define COMPRESSION_EXTENSIONS "zZF" /* pack, compress, freeze */ # else # define COMPRESSION_EXTENSIONS "zZ" /* pack, compress */ Index: xc/programs/xmh/command.c =================================================================== RCS file: /cvs/xorg/xc/programs/xmh/command.c,v retrieving revision 1.1.4.1 diff -u -3 -p -r1.1.4.1 command.c --- xc/programs/xmh/command.c 5 Mar 2004 13:41:37 -0000 1.1.4.1 +++ xc/programs/xmh/command.c 18 Apr 2004 07:49:35 -0000 @@ -35,7 +35,7 @@ #ifndef SYSV #include #endif /* SYSV */ -#if defined(SVR4) && !defined(SCO325) && !defined(DGUX) +#if defined(SVR4) && !defined(DGUX) #include #endif Index: xc/programs/xterm/main.c =================================================================== RCS file: /cvs/xorg/xc/programs/xterm/main.c,v retrieving revision 1.1.4.6 diff -u -3 -p -r1.1.4.6 main.c --- xc/programs/xterm/main.c 15 Apr 2004 10:17:51 -0000 1.1.4.6 +++ xc/programs/xterm/main.c 18 Apr 2004 07:49:37 -0000 @@ -144,7 +144,7 @@ SOFTWARE. static Bool IsPts = False; #endif -#if defined(SCO) || defined(SVR4) || defined(_POSIX_SOURCE) +#if defined(__SCO__) || defined(SVR4) || defined(_POSIX_SOURCE) #define USE_POSIX_SIGNALS #endif @@ -223,7 +223,7 @@ static Bool IsPts = False; #define USE_SYSV_SIGNALS #define USE_SYSV_PGRP -#if !defined(TIOCSWINSZ) +#if !defined(TIOCSWINSZ) || defined(SCO325) #define USE_SYSV_ENVVARS /* COLUMNS/LINES vs. TERMCAP */ #endif @@ -405,7 +405,7 @@ extern struct utmp *getutid __((struct u #include -#if defined(sco) || (defined(ISC) && !defined(_POSIX_SOURCE)) +#if defined(SCO325) || (defined(ISC) && !defined(_POSIX_SOURCE)) #undef SIGTSTP /* defined, but not the BSD way */ #endif @@ -2321,7 +2321,7 @@ get_pty(int *pty, char *from GCC_UNUSED) #endif result = ((*pty = open("/dev/ptmx", O_RDWR)) < 0); #endif -#if defined(SVR4) || defined(SCO325) || defined(USE_ISPTS_FLAG) +#if defined(SVR4) || defined(__SCO__) || defined(USE_ISPTS_FLAG) if (!result) strcpy(ttydev, ptsname(*pty)); #ifdef USE_ISPTS_FLAG @@ -3009,7 +3009,7 @@ spawn(void) * now in child process */ TRACE_CHILD -#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(SCO325) || defined(__QNX__) +#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) int pgrp = setsid(); /* variable may not be used... */ #else int pgrp = getpid(); @@ -3762,7 +3762,7 @@ spawn(void) errno, (errno != 0) ? strerror(errno) : "")); } #ifdef WTMP -#if defined(WTMPX_FILE) && (defined(SVR4) || defined(SCO325)) +#if defined(WTMPX_FILE) && (defined(SVR4) || defined(__SCO__)) if (term->misc.login_shell) updwtmpx(WTMPX_FILE, &utmp); #elif defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !(defined(__powerpc__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)) @@ -4244,7 +4244,7 @@ Exit(int n) #endif (void) pututline(utptr); #ifdef WTMP -#if defined(WTMPX_FILE) && (defined(SVR4) || defined(SCO325)) +#if defined(WTMPX_FILE) && (defined(SVR4) || defined(__SCO__)) if (term->misc.login_shell) updwtmpx(WTMPX_FILE, utptr); #elif defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !(defined(__powerpc__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)) Index: xc/programs/xterm/resize.c =================================================================== RCS file: /cvs/xorg/xc/programs/xterm/resize.c,v retrieving revision 1.1.4.3 diff -u -3 -p -r1.1.4.3 resize.c --- xc/programs/xterm/resize.c 5 Mar 2004 13:41:41 -0000 1.1.4.3 +++ xc/programs/xterm/resize.c 18 Apr 2004 07:49:37 -0000 @@ -69,7 +69,7 @@ #endif #ifndef USE_TERMINFO /* avoid conflict with configure script */ -#if defined(__QNX__) || defined(SCO) || defined(sco) || defined(linux) || defined(__OpenBSD__) +#if defined(__QNX__) || defined(__SCO__) || defined(linux) || defined(__OpenBSD__) #define USE_TERMINFO #endif #endif Index: xc/programs/xterm/xterm.h =================================================================== RCS file: /cvs/xorg/xc/programs/xterm/xterm.h,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 xterm.h --- xc/programs/xterm/xterm.h 5 Mar 2004 13:41:41 -0000 1.1.4.4 +++ xc/programs/xterm/xterm.h 18 Apr 2004 07:49:37 -0000 @@ -98,7 +98,7 @@ authorization. #define HAVE_TCGETATTR 1 #endif -#if defined(__UNIXOS2__) || defined(SCO) || defined(sco) +#if defined(__UNIXOS2__) || defined(__SCO__) #define USE_TERMCAP 1 #endif @@ -106,7 +106,7 @@ authorization. #define HAVE_UTMP 1 #endif -#if (defined(__MVS__) || defined(SVR4) || defined(SCO325)) && !defined(__CYGWIN__) +#if (defined(__MVS__) || defined(SVR4) || defined(__SCO__)) && !defined(__CYGWIN__) #define UTMPX_FOR_UTMP 1 #endif @@ -122,7 +122,7 @@ authorization. #define ut_xstatus ut_exit.e_exit #endif -#if defined(SVR4) || defined(SCO325) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !(defined(__powerpc__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0))) +#if defined(SVR4) || defined(__SCO__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !(defined(__powerpc__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0))) #define HAVE_UTMP_UT_XTIME 1 #endif @@ -133,16 +133,16 @@ authorization. #define USE_LASTLOG #endif -#if defined(SCO) +#if defined(__SCO__) #define DEFDELETE_DEL TRUE #define OPT_SCO_FUNC_KEYS 1 #endif -#if defined(SCO) || defined(SVR4) || defined(_POSIX_SOURCE) || defined(__QNX__) || defined(__hpux) || (defined(BSD) && (BSD >= 199103)) || defined(__CYGWIN__) +#if defined(__SCO__) || defined(SVR4) || defined(_POSIX_SOURCE) || defined(__QNX__) || defined(__hpux) || (defined(BSD) && (BSD >= 199103)) || defined(__CYGWIN__) #define USE_POSIX_WAIT #endif -#if defined(AIXV3) || defined(CRAY) || defined(SCO) || defined(SVR4) || (defined(SYSV) && defined(i386)) || defined(__MVS__) || defined(__hpux) || defined(__osf__) || defined(linux) || defined(macII) +#if defined(AIXV3) || defined(CRAY) || defined(__SCO__) || defined(SVR4) || (defined(SYSV) && defined(i386)) || defined(__MVS__) || defined(__hpux) || defined(__osf__) || defined(linux) || defined(macII) #define USE_SYSV_UTMP #endif Index: xc/programs/xterm/xterm_io.h =================================================================== RCS file: /cvs/xorg/xc/programs/xterm/xterm_io.h,v retrieving revision 1.1.4.4 diff -u -3 -p -r1.1.4.4 xterm_io.h --- xc/programs/xterm/xterm_io.h 5 Mar 2004 13:41:41 -0000 1.1.4.4 +++ xc/programs/xterm/xterm_io.h 18 Apr 2004 07:49:37 -0000 @@ -70,8 +70,10 @@ #ifdef SCO325 #define USE_TERMIOS +#ifndef _SVID3 #define _SVID3 #endif +#endif #ifdef Lynx #define USE_SYSV_TERMIO