[Libreoffice-commits] core.git: hwpfilter/source include/sal

[Michael Stahl]

 hwpfilter/source/grammar.cxx |    2 +-
 include/sal/types.h          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f2111a7ed11410ac80cd1b700315881d8b8ee7dd
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Dec 16 21:59:51 2013 +0100

    remove SGI compiler checks
    
    Change-Id: I8b4bce4b9c0cc457732b2de4af93049010de1097

diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index ba7c712..e10c598 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -379,7 +379,7 @@ static const short yycheck[] = {    11,
 #define YYSTACK_USE_ALLOCA
 #define alloca __builtin_alloca
 #else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || (defined (__sun) && defined (__i386))
 #define YYSTACK_USE_ALLOCA
 #include <sal/alloca.h>
 #else /* not sparc */
diff --git a/include/sal/types.h b/include/sal/types.h
index cc04246..11d62ae 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -88,7 +88,7 @@ typedef unsigned char       sal_uInt8;
     #define SAL_PRIuUINT64 "I64u"
     #define SAL_PRIxUINT64 "I64x"
     #define SAL_PRIXUINT64 "I64X"
-#elif defined (__GNUC__) || defined (sgi)
+#elif defined (__GNUC__)
     #if SAL_TYPES_SIZEOFLONG == 8
         typedef signed long int         sal_Int64;
         typedef unsigned long int       sal_uInt64;