diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 15:41:23 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 15:41:23 +0100 |
| commit | d863b3d5cb7ce6f21241e89dc01de797b4d0c3c5 (patch) | |
| tree | 319c568ca84caeae735a27397fa4885e4bfed793 /vcl/unx/source/app/keysymnames.cxx | |
| parent | 778b755a3fe25b887e00b93daa5d169072a195fe (diff) | |
tweaks for AIX
Diffstat (limited to 'vcl/unx/source/app/keysymnames.cxx')
| -rw-r--r-- | vcl/unx/source/app/keysymnames.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx index 9f605be3a7a3..20cb3332caed 100644 --- a/vcl/unx/source/app/keysymnames.cxx +++ b/vcl/unx/source/app/keysymnames.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef SOLARIS +#if !defined(SOLARIS) && !defined(AIX) #include <tools/prex.h> #include <X11/XKBlib.h> #include <tools/postx.h> @@ -601,7 +601,7 @@ const char* SalDisplay::GetKeyboardName( bool bRefresh ) { if( bRefresh || ! m_aKeyboardName.Len() ) { -#ifdef SOLARIS +#if defined(SOLARIS) if( IsLocal() ) { int kbd = open( "/dev/kbd", O_RDONLY ); @@ -640,7 +640,7 @@ const char* SalDisplay::GetKeyboardName( bool bRefresh ) close(kbd); } } -#else +#elif !defined(AIX) int opcode, event, error; int major = XkbMajorVersion, minor = XkbMinorVersion; if( XkbQueryExtension( GetDisplay(), &opcode, &event,&error, &major, &minor ) ) |