Unifdef AIX.
This commit is contained in:
parent
5f5eed7f79
commit
bd8bd2c700
|
@ -1022,8 +1022,3 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
|
|||
}
|
||||
|
||||
} /* end InitOutput */
|
||||
|
||||
/* this is just to get the server to link on AIX */
|
||||
#ifdef AIXV3
|
||||
int SelectWaitTime = 10000; /* usec */
|
||||
#endif
|
||||
|
|
|
@ -140,8 +140,3 @@ void ddxBeforeReset(void)
|
|||
{
|
||||
return;
|
||||
}
|
||||
|
||||
/* this is just to get the server to link on AIX */
|
||||
#ifdef AIXV3
|
||||
int SelectWaitTime = 10000; /* usec */
|
||||
#endif
|
||||
|
|
|
@ -150,13 +150,6 @@ SOFTWARE.
|
|||
|
||||
#endif /* sun && !(i386 && SVR4) */
|
||||
|
||||
#if defined(AIXV3)
|
||||
|
||||
#define IMAGE_BYTE_ORDER MSBFirst /* Values for the RISC/6000 */
|
||||
#define BITMAP_BIT_ORDER MSBFirst
|
||||
#define GLYPHPADBYTES 4
|
||||
|
||||
#endif /* AIXV3 */
|
||||
|
||||
#if defined(ibm032) || defined (ibm)
|
||||
|
||||
|
|
|
@ -90,9 +90,6 @@ SOFTWARE.
|
|||
#include <sys/ioctl.h>
|
||||
#endif
|
||||
|
||||
#ifdef AIXV3
|
||||
#include <sys/ioctl.h>
|
||||
#endif
|
||||
|
||||
#if defined(TCPCONN) || defined(STREAMSCONN)
|
||||
# include <netinet/in.h>
|
||||
|
|
19
os/utils.c
19
os/utils.c
|
@ -231,10 +231,6 @@ int auditTrailLevel = 1;
|
|||
|
||||
_X_EXPORT Bool Must_have_memory = FALSE;
|
||||
|
||||
#ifdef AIXV3
|
||||
int SyncOn = 0;
|
||||
extern int SelectWaitTime;
|
||||
#endif
|
||||
|
||||
#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
|
||||
#define HAS_SAVED_IDS_AND_SETEUID
|
||||
|
@ -509,7 +505,6 @@ AdjustWaitForDelay (pointer waitTime, unsigned long newdelay)
|
|||
|
||||
void UseMsg(void)
|
||||
{
|
||||
#if !defined(AIXrt) && !defined(AIX386)
|
||||
ErrorF("use: X [:<display>] [option]\n");
|
||||
ErrorF("-a # mouse acceleration (pixels)\n");
|
||||
ErrorF("-ac disable access control restrictions\n");
|
||||
|
@ -590,7 +585,6 @@ void UseMsg(void)
|
|||
#ifdef XDMCP
|
||||
XdmcpUseMsg();
|
||||
#endif
|
||||
#endif /* !AIXrt && ! AIX386 */
|
||||
#ifdef XKB
|
||||
XkbUseMsg();
|
||||
#endif
|
||||
|
@ -965,19 +959,6 @@ ProcessCommandLine(int argc, char *argv[])
|
|||
i = skip - 1;
|
||||
}
|
||||
#endif
|
||||
#ifdef AIXV3
|
||||
else if ( strcmp( argv[i], "-timeout") == 0)
|
||||
{
|
||||
if(++i < argc)
|
||||
SelectWaitTime = atoi(argv[i]);
|
||||
else
|
||||
UseMsg();
|
||||
}
|
||||
else if ( strcmp( argv[i], "-sync") == 0)
|
||||
{
|
||||
SyncOn++;
|
||||
}
|
||||
#endif
|
||||
#ifdef SMART_SCHEDULE
|
||||
else if ( strcmp( argv[i], "-dumbSched") == 0)
|
||||
{
|
||||
|
|
|
@ -48,7 +48,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include <X11/extensions/XI.h>
|
||||
#include "xkb.h"
|
||||
|
||||
#if defined(CSRG_BASED) || defined(linux) || defined(AIXV3) || defined(__osf__) || defined(__GNU__)
|
||||
#if defined(CSRG_BASED) || defined(linux) || defined(__osf__) || defined(__GNU__)
|
||||
#include <paths.h>
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user