File ogre-1.9.0-longlongconstants.patch of Package ogre

Overview Repositories Revisions Requests Users Attributes Meta

File ogre-1.9.0-longlongconstants.patch of Package ogre (Revision 63e4ca5bcf9046447c6cb4090df79604)

Currently displaying revision 63e4ca5bcf9046447c6cb4090df79604 , Show latest

From: Rene van Paassen <Rene.vanPaassen@gmail.com>
Date: 2014-03-11 16:34:05 +0100
Subject: gcc 4.3 does not accept long long constants without ULL
References: 
Upstream: no

Needed for SLES, and anyhow neater (since the constants are ULL)

Index: sinbad-ogre-dd30349ea667/OgreMain/include/OgrePixelFormatDescriptions.h
===================================================================
--- sinbad-ogre-dd30349ea667.orig/OgreMain/include/OgrePixelFormatDescriptions.h
+++ sinbad-ogre-dd30349ea667/OgreMain/include/OgrePixelFormatDescriptions.h
@@ -760,7 +760,7 @@ namespace Ogre {
             /* rbits, gbits, bbits, abits */
             16, 16, 16, 0,
             /* Masks and shifts */
-            0xFFFF00000000, 0x0000FFFF0000, 0x00000000FFFF, 0,
+            0xFFFF00000000ULL, 0x0000FFFF0000ULL, 0x00000000FFFFULL, 0,
             32, 16, 0, 0
         },
         //-----------------------------------------------------------------------
@@ -774,7 +774,7 @@ namespace Ogre {
             /* rbits, gbits, bbits, abits */
             16, 16, 16, 16,
             /* Masks and shifts */
-            0xFFFF000000000000, 0x0000FFFF00000000, 0x00000000FFFF0000, 0x000000000000FFFF,
+            0xFFFF000000000000ULL, 0x0000FFFF00000000ULL, 0x00000000FFFF0000ULL, 0x000000000000FFFFULL,
             48, 32, 16, 0
         },
         //-----------------------------------------------------------------------
@@ -802,7 +802,7 @@ namespace Ogre {
             /* rbits, gbits, bbits, abits */
             32, 32, 0, 0,
             /* Masks and shifts */
-            0xFFFFFFFF00000000, 0xFFFFFFFF, 0, 0,
+            0xFFFFFFFF00000000ULL, 0xFFFFFFFFULL, 0, 0,
             32, 0, 0, 0
         },
         //-----------------------------------------------------------------------
@@ -928,7 +928,7 @@ namespace Ogre {
             /* rbits, gbits, bbits, abits */
             16, 16, 16, 0,
             /* Masks and shifts */
-            0xFFFF00000000, 0x0000FFFF0000, 0x00000000FFFF, 0,
+            0xFFFF00000000ULL, 0x0000FFFF0000ULL, 0x00000000FFFFULL, 0,
             32, 16, 0, 0
         },
         //-----------------------------------------------------------------------
@@ -942,7 +942,7 @@ namespace Ogre {
             /* rbits, gbits, bbits, abits */
             16, 16, 16, 16,
             /* Masks and shifts */
-            0xFFFF000000000000, 0x0000FFFF00000000, 0x00000000FFFF0000, 0x000000000000FFFF,
+            0xFFFF000000000000ULL, 0x0000FFFF00000000ULL, 0x00000000FFFF0000ULL, 0x000000000000FFFFULL,
             48, 32, 16, 0
         },
         //-----------------------------------------------------------------------
@@ -970,7 +970,7 @@ namespace Ogre {
             /* rbits, gbits, bbits, abits */
             32, 32, 0, 0,
             /* Masks and shifts */
-            0xFFFFFFFF00000000, 0xFFFFFFFF, 0, 0,
+            0xFFFFFFFF00000000ULL, 0xFFFFFFFFULL, 0, 0,
             32, 0, 0, 0
         },
         //-----------------------------------------------------------------------
@@ -1242,7 +1242,7 @@ namespace Ogre {
             /* rbits, gbits, bbits, abits */
             16, 16, 16, 0,
             /* Masks and shifts */
-            0xFFFF00000000, 0x0000FFFF0000, 0x00000000FFFF, 0,
+            0xFFFF00000000ULL, 0x0000FFFF0000ULL, 0x00000000FFFFULL, 0,
             32, 16, 0, 0
         },
         //-----------------------------------------------------------------------
@@ -1256,7 +1256,7 @@ namespace Ogre {
             /* rbits, gbits, bbits, abits */
             16, 16, 16, 16,
             /* Masks and shifts */
-            0xFFFF000000000000, 0x0000FFFF00000000, 0x00000000FFFF0000, 0x000000000000FFFF,
+            0xFFFF000000000000ULL, 0x0000FFFF00000000ULL, 0x00000000FFFF0000ULL, 0x000000000000FFFFULL,
             48, 32, 16, 0
         },

Places

File ogre-1.9.0-longlongconstants.patch of Package ogre (Revision 63e4ca5bcf9046447c6cb4090df79604)

Places