diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-07-23 13:36:35 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-07-23 13:37:42 -0400 |
| commit | bd8bd2c700e6ccac53b47c45766c0a3a08a59344 (patch) | |
| tree | 671eca3c1f26ffcc2a7a69a9d127824d9a1dbd38 /os | |
| parent | 5f5eed7f790db2f0ae0cd0f5c5ee5a312079c0b0 (diff) | |
Unifdef AIX.
Diffstat (limited to 'os')
| -rw-r--r-- | os/connection.c | 3 | ||||
| -rw-r--r-- | os/utils.c | 19 |
2 files changed, 0 insertions, 22 deletions
diff --git a/os/connection.c b/os/connection.c index 021776271..89795bf77 100644 --- a/os/connection.c +++ b/os/connection.c @@ -90,9 +90,6 @@ SOFTWARE. #include <sys/ioctl.h> #endif -#ifdef AIXV3 -#include <sys/ioctl.h> -#endif #if defined(TCPCONN) || defined(STREAMSCONN) # include <netinet/in.h> diff --git a/os/utils.c b/os/utils.c index 35f1e849d..86f13f168 100644 --- a/os/utils.c +++ b/os/utils.c @@ -231,10 +231,6 @@ int auditTrailLevel = 1; _X_EXPORT Bool Must_have_memory = FALSE; -#ifdef AIXV3 -int SyncOn = 0; -extern int SelectWaitTime; -#endif #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED) #define HAS_SAVED_IDS_AND_SETEUID @@ -509,7 +505,6 @@ AdjustWaitForDelay (pointer waitTime, unsigned long newdelay) void UseMsg(void) { -#if !defined(AIXrt) && !defined(AIX386) ErrorF("use: X [:<display>] [option]\n"); ErrorF("-a # mouse acceleration (pixels)\n"); ErrorF("-ac disable access control restrictions\n"); @@ -590,7 +585,6 @@ void UseMsg(void) #ifdef XDMCP XdmcpUseMsg(); #endif -#endif /* !AIXrt && ! AIX386 */ #ifdef XKB XkbUseMsg(); #endif @@ -965,19 +959,6 @@ ProcessCommandLine(int argc, char *argv[]) i = skip - 1; } #endif -#ifdef AIXV3 - else if ( strcmp( argv[i], "-timeout") == 0) - { - if(++i < argc) - SelectWaitTime = atoi(argv[i]); - else - UseMsg(); - } - else if ( strcmp( argv[i], "-sync") == 0) - { - SyncOn++; - } -#endif #ifdef SMART_SCHEDULE else if ( strcmp( argv[i], "-dumbSched") == 0) { |