diff options
author | Adam Jackson <ajax@redhat.com> | 2008-07-23 13:25:37 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2008-07-23 13:37:42 -0400 |
commit | 856db05b58b71c5ff22af727aba435a8c356abfa (patch) | |
tree | 11901335f246f57a87b87a3ac13a0b59883464fb /xkb | |
parent | ab6557fcd4bb4fd580bb1727dc8764f7dfb2cb30 (diff) |
Unifdef sgi.
Diffstat (limited to 'xkb')
-rw-r--r-- | xkb/ddxLoad.c | 2 | ||||
-rw-r--r-- | xkb/xkbInit.c | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index d6b5f7589..115f8555f 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -48,7 +48,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <X11/extensions/XI.h> #include "xkb.h" -#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__) +#if defined(CSRG_BASED) || defined(linux) || defined(AIXV3) || defined(__osf__) || defined(__GNU__) #include <paths.h> #endif diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 8043f5aa9..9033a1371 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -55,13 +55,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define CREATE_ATOM(s) MakeAtom(s,sizeof(s)-1,1) -#ifdef sgi -#define LED_CAPS 5 -#define LED_NUM 6 -#define LED_SCROLL 7 -#define PHYS_LEDS 0x7f -#define LED_COMPOSE 8 -#else #if defined(__osf__) || defined(__alpha) || defined(__alpha__) #define LED_COMPOSE 2 #define LED_CAPS 3 @@ -82,7 +75,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define PHYS_LEDS 0x07 #endif #endif -#endif #define MAX_TOC 16 typedef struct _SrvXkmInfo { |