mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweaks for AIX

Browse Source
This commit is contained in:
Caolán McNamara
2010-10-13 15:41:23 +01:00
parent 778b755a3f
commit d863b3d5cb
8 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vcl/unx/gtk/a11y/atklistener.cxx
View File

@@ -28,6 +28,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#ifdef AIX
#define _LINUX_SOURCE_COMPAT
#include <sys/timer.h>
#undef _LINUX_SOURCE_COMPAT
#endif
#include <com/sun/star/accessibility/TextSegment.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>

2
vcl/unx/gtk/a11y/atktextattributes.cxx
View File

@@ -1092,7 +1092,7 @@ TabStopList2String( const uno::Any& rAny, bool default_tabs )
if( ret )
{
gchar * old_tab_str = ret;
ret = g_strconcat(old_tab_str, " ", tab_str, NULL /* terminated */);
ret = g_strconcat(old_tab_str, " ", tab_str, (const char*)NULL);
g_free( old_tab_str );
}
else

6
vcl/unx/gtk/a11y/atkutil.cxx
View File

@@ -28,6 +28,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#ifdef AIX
#define _LINUX_SOURCE_COMPAT
#include <sys/timer.h>
#undef _LINUX_SOURCE_COMPAT
#endif
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>

6
vcl/unx/gtk/app/gtksys.cxx
View File

@@ -28,6 +28,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#ifdef AIX
#define _LINUX_SOURCE_COMPAT
#include <sys/timer.h>
#undef _LINUX_SOURCE_COMPAT
#endif
#include <svunx.h>
#include <vcl/svdata.hxx>
#include <vcl/window.hxx>

6
vcl/unx/gtk/window/gtkobject.cxx
View File

@@ -28,6 +28,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#ifdef AIX
#define _LINUX_SOURCE_COMPAT
#include <sys/timer.h>
#undef _LINUX_SOURCE_COMPAT
#endif
#include <plugins/gtk/gtkobject.hxx>
#include <plugins/gtk/gtkframe.hxx>
#include <plugins/gtk/gtkdata.hxx>

6
vcl/unx/source/app/keysymnames.cxx
View File

@@ -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 ) )

2
vcl/unx/source/app/saldisp.cxx
View File

@@ -41,7 +41,7 @@
#include <ctype.h>
#include <string.h>
#if defined(SOLARIS)
#if defined(SOLARIS) || defined(AIX)
#include <sal/alloca.h>
#include <osl/module.h>
#endif

10
vcl/unx/source/window/salframe.cxx
View File

@@ -38,7 +38,7 @@
#include <X11/keysym.h>
#include "FWS.hxx"
#include <X11/extensions/shape.h>
#ifndef SOLARIS
#if !defined(SOLARIS) && !defined(AIX)
#include <X11/extensions/dpms.h>
#endif
#include <tools/postx.h>
@@ -2360,7 +2360,7 @@ void X11SalFrame::StartPresentation( BOOL bStart )
// needs static here to save DPMS settings
int dummy;
static bool DPMSExtensionAvailable =
#ifndef SOLARIS
#if !defined(SOLARIS) && !defined(AIX)
(DPMSQueryExtension(GetXDisplay(), &dummy, &dummy) != 0);
static XLIB_BOOL DPMSEnabled = false;
#else
@@ -2395,7 +2395,7 @@ void X11SalFrame::StartPresentation( BOOL bStart )
// get the DPMS state right before the start
if (DPMSExtensionAvailable)
{
#ifndef SOLARIS
#if !defined(SOLARIS) && !defined(AIX)
CARD16 state; // card16 is defined in Xdm.h
DPMSInfo( GetXDisplay(),
&state,
@@ -2414,7 +2414,7 @@ void X11SalFrame::StartPresentation( BOOL bStart )
prefer_blanking,
allow_exposures );
}
#ifndef SOLARIS
#if !defined(SOLARIS) && !defined(AIX)
if( DPMSEnabled )
{
if ( DPMSExtensionAvailable )
@@ -2439,7 +2439,7 @@ void X11SalFrame::StartPresentation( BOOL bStart )
allow_exposures );
nScreenSaversTimeout_ = 0;
}
#ifndef SOLARIS
#if !defined(SOLARIS) && !defined(AIX)
if ( DPMSEnabled )
{
if ( DPMSExtensionAvailable )