[Libreoffice-commits] .: 4 commits - l10ntools/source padmin/source tools/source vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Oct 13 12:37:38 PDT 2010
l10ntools/source/help/HelpLinker.cxx | 4 ++++
padmin/source/spadmin.sh | 13 +++++++++++--
tools/source/stream/strmunx.cxx | 2 +-
tools/source/string/makefile.mk | 2 ++
vcl/unx/gtk/a11y/atklistener.cxx | 6 ++++++
vcl/unx/gtk/a11y/atktextattributes.cxx | 2 +-
vcl/unx/gtk/a11y/atkutil.cxx | 6 ++++++
vcl/unx/gtk/app/gtksys.cxx | 6 ++++++
vcl/unx/gtk/window/gtkobject.cxx | 6 ++++++
vcl/unx/source/app/keysymnames.cxx | 6 +++---
vcl/unx/source/app/saldisp.cxx | 2 +-
vcl/unx/source/window/salframe.cxx | 10 +++++-----
12 files changed, 52 insertions(+), 13 deletions(-)
New commits:
commit e9bcdc225d05ac6afe6ac16e335a53f5cc24737d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 15:41:23 2010 +0100
tweaks for AIX
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index 7b63d25..4790585 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -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>
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 0449881..6460dea 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -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
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index fce5916..71a6be6 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -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>
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index c928b6f..1a4f97f 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -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>
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index b7b5406..64ca348 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -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>
diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx
index 7a4f984..5ef9e5a 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 ) )
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index 2a17766..6251781 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -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
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index ddadc77..99ae82e 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -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 )
commit 2f6c52290594fa8fc15e28cb564d129f9d053487
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 15:37:04 2010 +0100
fixes for AIX
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 753b9a6..2212861 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -209,7 +209,7 @@ static sal_uInt32 GetSvError( int nErrno )
{ 0, SVSTREAM_OK },
{ EACCES, SVSTREAM_ACCESS_DENIED },
{ EBADF, SVSTREAM_INVALID_HANDLE },
-#if defined( RS6000 ) || defined( ALPHA ) || defined( HP9000 ) || defined( NETBSD ) || defined(FREEBSD) || defined(MACOSX) || defined(__FreeBSD_kernel__)
+#if defined( RS6000 ) || defined( ALPHA ) || defined( HP9000 ) || defined( NETBSD ) || defined(FREEBSD) || defined(MACOSX) || defined(__FreeBSD_kernel__) || defined ( AIX )
{ EDEADLK, SVSTREAM_LOCKING_VIOLATION },
#else
{ EDEADLOCK, SVSTREAM_LOCKING_VIOLATION },
diff --git a/tools/source/string/makefile.mk b/tools/source/string/makefile.mk
index 4caa316..255feac 100644
--- a/tools/source/string/makefile.mk
+++ b/tools/source/string/makefile.mk
@@ -37,7 +37,9 @@ TARGET=str
# --- Files --------------------------------------------------------
+.IF "$(OS)"!="AIX"
ALWAYSDBGFILES = $(SLO)$/debugprint.obj
+.ENDIF
.IF "$(ALWAYSDBGFILES)" != ""
ALWAYSDBGTARGET=do_it_alwaysdebug
commit 4e498609410348cdb67675d58523012c64ffc3c1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 13:55:18 2010 +0100
tweak this for AIX
diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh
index 01b1964..b57fd63 100644
--- a/padmin/source/spadmin.sh
+++ b/padmin/source/spadmin.sh
@@ -57,8 +57,17 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
- LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- export LD_LIBRARY_PATH
+ sd_platform=`uname -s`
+ case $sd_platform in
+ AIX)
+ LIBPATH=$my_path${LIBPATH:+:$LIBPATH}
+ export LIBPATH
+ ;;
+ *)
+ LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ export LD_LIBRARY_PATH
+ ;;
+ esac
fi
fi
commit e5c8ed4e7c05f980be4093c085c15f72088649a5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 13:31:43 2010 +0100
hackaround for AIX
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 512c1de..847efb9 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -25,6 +25,10 @@
*
************************************************************************/
+#ifdef AIX
+# undef _THREAD_SAFE
+#endif
+
#include "HelpCompiler.hxx"
#include <map>
More information about the Libreoffice-commits
mailing list