From 4a2280e4a2bbc936625dc9816e5491da6ba770ac Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Mon, 4 Aug 2014 15:52:16 +0200
Subject: Kill XSUN Xinerama support

XSun is a relic from Solaris 10 / SPARC.

Change-Id: I5c379a496ee5953d71fe51b86cf9992c92943126
Reviewed-on: https://gerrit.libreoffice.org/10756
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
---
 vcl/unx/generic/app/saldisp.cxx | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

(limited to 'vcl/unx')

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 73c7b1fd4c5e..91c57069ca54 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -44,14 +44,6 @@
 
 #ifdef USE_XINERAMA_XORG
 #include <X11/extensions/Xinerama.h>
-#elif defined USE_XINERAMA_XSUN
-#if defined(SOLARIS) && defined(INTEL) // missing extension header in standard installation
-#define MAXFRAMEBUFFERS       16
-Bool XineramaGetState(Display*, int);
-Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
-#else
-#include <X11/extensions/xinerama.h>
-#endif
 #endif
 
 #include <postx.h>
@@ -2228,30 +2220,7 @@ void SalDisplay::InitXinerama()
         m_bXinerama = false;
         return; // multiple screens mean no xinerama
     }
-#if defined(USE_XINERAMA_XSUN)
-    int nFramebuffers = 1;
-    if( XineramaGetState( pDisp_, m_nDefaultScreen ) )
-    {
-        XRectangle pFramebuffers[MAXFRAMEBUFFERS];
-        unsigned char hints[MAXFRAMEBUFFERS];
-        int result = XineramaGetInfo( pDisp_,
-                                      m_nDefaultScreen,
-                                      pFramebuffers,
-                                      hints,
-                                      &nFramebuffers );
-        if( result > 0 && nFramebuffers > 1 )
-        {
-            m_bXinerama = true;
-            m_aXineramaScreens = std::vector<Rectangle>();
-            m_aXineramaScreenIndexMap = std::vector<int>(nFramebuffers);
-            for( int i = 0; i < nFramebuffers; i++ )
-                addXineramaScreenUnique( i, pFramebuffers[i].x,
-                                         pFramebuffers[i].y,
-                                         pFramebuffers[i].width,
-                                         pFramebuffers[i].height );
-        }
-    }
-#elif defined(USE_XINERAMA_XORG)
+#if defined(USE_XINERAMA_XORG)
     if( XineramaIsActive( pDisp_ ) )
     {
         int nFramebuffers = 1;
-- 
cgit v1.2.3