diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/unx/salunxtime.h | 4 | ||||
-rw-r--r-- | vcl/inc/unx/screensaverinhibitor.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldata.cxx | 3 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/screensaverinhibitor.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk3/a11y/atklistener.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk3/a11y/atkutil.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk3/fpicker/SalGtkPicker.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtkobject.cxx | 6 |
11 files changed, 5 insertions, 48 deletions
diff --git a/vcl/inc/unx/salunxtime.h b/vcl/inc/unx/salunxtime.h index 13f8ecc35bf1..b56bc846374c 100644 --- a/vcl/inc/unx/salunxtime.h +++ b/vcl/inc/unx/salunxtime.h @@ -23,10 +23,6 @@ #if defined LINUX || defined FREEBSD || \ defined NETBSD || defined OPENBSD || defined DRAGONFLY #include <sys/time.h> -#elif defined AIX -#include <time.h> -#include <sys/time.h> -#include <strings.h> #endif #include <sal/types.h> diff --git a/vcl/inc/unx/screensaverinhibitor.hxx b/vcl/inc/unx/screensaverinhibitor.hxx index f57d78b9758a..4ddbb53f9c12 100644 --- a/vcl/inc/unx/screensaverinhibitor.hxx +++ b/vcl/inc/unx/screensaverinhibitor.hxx @@ -36,7 +36,7 @@ private: std::optional<int> mnXScreenSaverTimeout; -#if !defined(__sun) && !defined(AIX) +#if !defined(__sun) BOOL mbDPMSWasEnabled; CARD16 mnDPMSStandbyTimeout; CARD16 mnDPMSSuspendTimeout; diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index 488e9937dc19..34c7c0878991 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -26,9 +26,6 @@ #ifdef SUN #include <sys/systeminfo.h> #endif -#ifdef AIX -#include <strings.h> -#endif #ifdef FREEBSD #include <sys/types.h> #include <sys/time.h> diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index e3f6f4e767bf..cabc42e7d053 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -23,7 +23,7 @@ #include <math.h> #include <unistd.h> -#if defined(__sun) || defined(AIX) +#if defined(__sun) #include <osl/module.h> #endif diff --git a/vcl/unx/generic/window/screensaverinhibitor.cxx b/vcl/unx/generic/window/screensaverinhibitor.cxx index 36eac26c28dd..ec19fad09e5d 100644 --- a/vcl/unx/generic/window/screensaverinhibitor.cxx +++ b/vcl/unx/generic/window/screensaverinhibitor.cxx @@ -17,7 +17,7 @@ #include <X11/Xlib.h> #include <X11/Xatom.h> -#if !defined(__sun) && !defined(AIX) +#if !defined(__sun) #include <X11/extensions/dpms.h> #endif @@ -329,7 +329,7 @@ void ScreenSaverInhibitor::inhibitXAutoLock( bool bInhibit, Display* pDisplay ) void ScreenSaverInhibitor::inhibitDPMS( bool bInhibit, Display* pDisplay ) { -#if !defined(__sun) && !defined(AIX) +#if !defined(__sun) int dummy; // This won't change while X11 is running, hence // we can evaluate only once and store as static @@ -364,7 +364,7 @@ void ScreenSaverInhibitor::inhibitDPMS( bool bInhibit, Display* pDisplay ) mnDPMSSuspendTimeout, mnDPMSOffTimeout ); } -#endif // !defined(__sun) && !defined(AIX) +#endif // !defined(__sun) } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk3/a11y/atklistener.cxx b/vcl/unx/gtk3/a11y/atklistener.cxx index 98cbfab3a2cd..cfab14d58a90 100644 --- a/vcl/unx/gtk3/a11y/atklistener.cxx +++ b/vcl/unx/gtk3/a11y/atklistener.cxx @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#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/gtk3/a11y/atkutil.cxx b/vcl/unx/gtk3/a11y/atkutil.cxx index d57818f2d40f..b16648ecbf0e 100644 --- a/vcl/unx/gtk3/a11y/atkutil.cxx +++ b/vcl/unx/gtk3/a11y/atkutil.cxx @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef AIX -#define _LINUX_SOURCE_COMPAT -#include <sys/timer.h> -#undef _LINUX_SOURCE_COMPAT -#endif - #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx index 4068d57f2fa1..9afb55f0eb21 100644 --- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef AIX -#define _LINUX_SOURCE_COMPAT -#include <sys/timer.h> -#undef _LINUX_SOURCE_COMPAT -#endif - #include <config_gio.h> #include <com/sun/star/awt/SystemDependentXWindow.hpp> diff --git a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx index ae617d5af181..57b6e7c53e18 100644 --- a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef AIX -#define _LINUX_SOURCE_COMPAT -#include <sys/timer.h> -#undef _LINUX_SOURCE_COMPAT -#endif - #include <config_gio.h> #include <com/sun/star/awt/Toolkit.hpp> diff --git a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx index 5810a545f4ea..9d07a11f7620 100644 --- a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef AIX -#define _LINUX_SOURCE_COMPAT -#include <sys/timer.h> -#undef _LINUX_SOURCE_COMPAT -#endif - #include <com/sun/star/frame/TerminationVetoException.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp> diff --git a/vcl/unx/gtk3/gtkobject.cxx b/vcl/unx/gtk3/gtkobject.cxx index ca01e7795ab4..bd553137a81b 100644 --- a/vcl/unx/gtk3/gtkobject.cxx +++ b/vcl/unx/gtk3/gtkobject.cxx @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef AIX -#define _LINUX_SOURCE_COMPAT -#include <sys/timer.h> -#undef _LINUX_SOURCE_COMPAT -#endif - #include <unx/gtk/gtkbackend.hxx> #include <unx/gtk/gtkobject.hxx> #include <unx/gtk/gtkframe.hxx> |