[Libreoffice-commits] .: cppu/inc sal/inc

[Michael Meeks]

 cppu/inc/cppu/macros.hxx |    2 +-
 sal/inc/sal/config.h     |   12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 3e41d0bf6a8d77ffa30889cf8b7ebdb5c7910792
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Feb 14 14:14:38 2012 +0000

    cleanup: remove remenants of gcc version checking

diff --git a/cppu/inc/cppu/macros.hxx b/cppu/inc/cppu/macros.hxx
index 78df315..3d99bc9 100644
--- a/cppu/inc/cppu/macros.hxx
+++ b/cppu/inc/cppu/macros.hxx
@@ -45,7 +45,7 @@
     struct to become 8 instead of 4 if CPPU_GCC3_ALIGN were added to its first
     member.)
 */
-#if defined(__GNUC__) && (__GNUC__ >= 3)
+#if defined(__GNUC__)
 #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct))))
 #else
 #define CPPU_GCC3_ALIGN( base_struct )
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index e4ed257..aee8e82 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -116,18 +116,6 @@
 #define sun sun
 #endif
 
-/* This is to work around a gcc 3.3 error that fixing actually breaks other
- * compilers.  This will create a dummy variable specifically for gcc 3.3 that
- * allows it to compile and not break the others.  Other compilers may follow
- * with this eror later. */
-#if defined __GNUC__
-#if ((__GNUC__ == 3) && (__GNUC_MINOR__ > 2))
-#  define SAL_ISO_CONST const
-#else
-#  define SAL_ISO_CONST
-#endif
-#endif
-
 #endif /*_SAL_CONFIG_H_ */