[Libreoffice-commits] core.git: desktop/unx

Stephan Bergmann sbergman at redhat.com
Tue Dec 2 12:37:59 PST 2014


 desktop/unx/source/splashx.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit eaddcb8a517d6f39ca8036e9e021e40f88c7d98c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 2 21:37:24 2014 +0100

    Use OSL_LIT/BIGENDIAN
    
    ...one of which is guaranteed to be defined
    
    Change-Id: Icb02826f8da03ad0d605ec11f07bf60f30d1a3d0

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index a300a02..db9e01e 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -243,18 +243,10 @@ static void create_pixmap(struct splash* splash)
         int bytes_per_line = image->bytes_per_line;
         int bpp = image->bits_per_pixel;
         int byte_order = image->byte_order;
-#if defined( _LITTLE_ENDIAN )
+#if defined OSL_LITENDIAN
         int machine_byte_order = LSBFirst;
-#elif defined( _BIG_ENDIAN )
+#else /* OSL_BIGENDIAN */
         int machine_byte_order = MSBFirst;
-#else
-        {
-            fprintf( stderr, "Unsupported machine endianity.\n" );
-            XFreeGC( splash->display, pixmap_gc );
-            XFreePixmap( splash->display, pixmap );
-            XDestroyImage( image );
-            return;
-        }
 #endif
 
         char *data = malloc( splash->height * bytes_per_line );


More information about the Libreoffice-commits mailing list