[Libreoffice-commits] .: extensions/source

Caolán McNamara caolan at kemper.freedesktop.org
Wed Oct 13 12:32:28 PDT 2010 

 extensions/source/nsplugin/source/npshell.cxx       |    4 ++--
 extensions/source/plugin/base/context.cxx           |    6 ++++++
 extensions/source/plugin/base/evtlstnr.cxx          |    6 ++++++
 extensions/source/plugin/base/manager.cxx           |    6 ++++++
 extensions/source/plugin/base/nfuncs.cxx            |    6 ++++++
 extensions/source/plugin/base/plcom.cxx             |    6 ++++++
 extensions/source/plugin/base/service.cxx           |    6 ++++++
 extensions/source/plugin/base/xplugin.cxx           |    5 +++++
 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |    6 +++---
 extensions/source/plugin/unx/makefile.mk            |    2 ++
 extensions/source/plugin/unx/npnapi.cxx             |    7 +++++++
 extensions/source/plugin/unx/nppapi.cxx             |    6 ++++++
 extensions/source/plugin/unx/npwrap.cxx             |    5 +++++
 extensions/source/plugin/unx/plugcon.cxx            |    7 +++++++
 extensions/source/plugin/unx/sysplug.cxx            |    7 +++++++
 extensions/source/plugin/unx/unxmgr.cxx             |    7 +++++++
 16 files changed, 87 insertions(+), 5 deletions(-)

New commits:
commit 8e83621a3e9c13dedec0dab87dfa424cc5e15de3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 13 13:20:35 2010 +0100

    fix AIX build

diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index d92a06f..d19b7b6 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -79,7 +79,7 @@
 //https://bugzilla.mozilla.org/show_bug.cgi?id=241262
 #ifdef UNIX
 #  ifndef _UINT32
-#    if defined(__alpha) || defined(__LP64__)
+#    if defined(__alpha) || defined(__LP64__) || defined(AIX)
        typedef unsigned int uint32;
 #    else  /* __alpha */
        typedef unsigned long uint32;
@@ -87,7 +87,7 @@
 #    define _UINT32
 #  endif
 #  ifndef _INT32
-#    if defined(__alpha) || defined(__LP64__)
+#    if defined(__alpha) || defined(__LP64__) || defined(AIX)
        typedef int int32;
 #    else  /* __alpha */
        typedef long int32;
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index f75c54d..bf23f9c 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -29,6 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
 #if STLPORT_VERSION>=321
 #include <cstdarg>
 #include <cstdio>
diff --git a/extensions/source/plugin/base/evtlstnr.cxx b/extensions/source/plugin/base/evtlstnr.cxx
index f420429..ffbf3c2 100644
--- a/extensions/source/plugin/base/evtlstnr.cxx
+++ b/extensions/source/plugin/base/evtlstnr.cxx
@@ -29,6 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
 #if STLPORT_VERSION>=321
 #include <cstdarg>
 #endif
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index 4a2f24a..4e19324 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -29,6 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
 #if STLPORT_VERSION>=321
 #include <cstdarg>
 #endif
diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index 55ccaa1..cbfc05e 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -29,6 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
 #if STLPORT_VERSION>=321
 #include <cstdarg>
 #endif
diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx
index 0051c3c..a77145c 100644
--- a/extensions/source/plugin/base/plcom.cxx
+++ b/extensions/source/plugin/base/plcom.cxx
@@ -29,6 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
 #ifdef SOLARIS
 #include <limits>
 #endif
diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx
index 2916160..0b5d832 100644
--- a/extensions/source/plugin/base/service.cxx
+++ b/extensions/source/plugin/base/service.cxx
@@ -29,6 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
 #if STLPORT_VERSION>=321
 #include <cstdarg>
 #endif
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 91bf9a3..c9f355a 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -28,6 +28,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/loader/XImplementationLoader.hpp>
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index c347fed..3438dba 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -35,7 +35,7 @@
 #include <plugin/unx/mediator.hxx>
 
 #if defined SOLARIS
-#define USE_MOTIF
+#    define USE_MOTIF
 #endif
 
 #define Window		XLIB_Window
@@ -80,7 +80,7 @@ extern "C" {
 //https://bugzilla.mozilla.org/show_bug.cgi?id=241262
 #ifdef UNIX
 #  ifndef _UINT32
-#    if defined(__alpha) || defined(__LP64__)
+#    if defined(__alpha) || defined(__LP64__) || defined(AIX)
        typedef unsigned int uint32;
 #    else  /* __alpha */
        typedef unsigned long uint32;
@@ -88,7 +88,7 @@ extern "C" {
 #    define _UINT32
 #  endif
 #  ifndef _INT32
-#    if defined(__alpha) || defined(__LP64__)
+#    if defined(__alpha) || defined(__LP64__) || defined(AIX)
        typedef int int32;
 #    else  /* __alpha */
        typedef long int32;
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
index 669aaa5..b88acc9 100644
--- a/extensions/source/plugin/unx/makefile.mk
+++ b/extensions/source/plugin/unx/makefile.mk
@@ -80,6 +80,8 @@ APP1STDLIBS+=-lXaw
 .ENDIF
 .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
 APP1STDLIBS+= -lXt -lXext -lX11
+.ELIF "$(OS)"=="AIX"
+APP1STDLIBS+= -lXpm -lXmu -lXt $(X11LINK_DYNAMIC) -ldl
 .ELSE
 APP1STDLIBS+= -lXt $(X11LINK_DYNAMIC) -ldl
 .ENDIF
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index a5b6052..f1f58fc 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -28,6 +28,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
+
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
 #include <plugin/unx/plugcon.hxx>
 
 #include <unistd.h>
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index 06d9da5..f263238 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -29,6 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
 #if STLPORT_VERSION>=321
 #include <cstdarg>
 #endif
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 3ce90f5..d26983c 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -28,6 +28,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
 #include <errno.h>
 #include <dlfcn.h>
 #include <unistd.h>
diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx
index 0a66b55..512a7db 100644
--- a/extensions/source/plugin/unx/plugcon.cxx
+++ b/extensions/source/plugin/unx/plugcon.cxx
@@ -28,6 +28,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
+
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
 #include <plugin/unx/plugcon.hxx>
 
 #include <cstdarg>
diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx
index 77f60eb..f5221aa 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -28,6 +28,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
+
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
 #include <cstdarg>
 
 #include <sys/types.h>
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index c9cdf50..b042815 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -28,6 +28,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
+
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
 #include <cstdarg>
 #include <sys/stat.h>
 #include <sys/types.h>

More information about the Libreoffice-commits mailing list