[Libreoffice-commits] .: 2 commits - binfilter/bf_sw binfilter/bf_xmloff binfilter/inc hwpfilter/source

[Thomas Arnhold]

 binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx |    4 ++--
 binfilter/bf_xmloff/util/makefile.mk         |    5 -----
 binfilter/inc/bf_svtools/svarray.hxx         |    2 +-
 hwpfilter/source/grammar.cpp                 |    7 -------
 4 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit 394609fffac506f154776cc618e48093e274188e
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 16 13:26:14 2011 +0100

    Remove SCO support

diff --git a/binfilter/bf_xmloff/util/makefile.mk b/binfilter/bf_xmloff/util/makefile.mk
index 0a10793..787b987 100644
--- a/binfilter/bf_xmloff/util/makefile.mk
+++ b/binfilter/bf_xmloff/util/makefile.mk
@@ -84,11 +84,6 @@ SHL1STDLIBS= \
         $(BFGOODIESLIB) \
         $(BFSO3LIB)
 
-# SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "(OS)"=="SCO"
-SHL1STDLIBS+=-licg617mxp
-.ENDIF
-
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=   $(LIB1TARGET)
 
commit 93d1972c6c6d7ad4542c76774fdcae13481df7ca
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 16 12:53:30 2011 +0100

    Remove HPUX support

diff --git a/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx b/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
index 3a48922..7679d84 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
@@ -1240,7 +1240,7 @@ static SwHintFn const aGrfInAttrs[] =
 /* OLDRES_GRFATR_CROPGRF    */          InSWG_SwCropGrf
 };
 
-#if defined GCC || defined HPUX
+#if defined GCC
 struct HintFns
 #else
 static struct HintFns
@@ -1249,7 +1249,7 @@ static struct HintFns
     const SwHintFn* pHintTab;
     short     nHintId1;
 }
-#if defined GCC || defined HPUX
+#if defined GCC
 ;
 static const HintFns aHintFns[] =
 #else
diff --git a/binfilter/inc/bf_svtools/svarray.hxx b/binfilter/inc/bf_svtools/svarray.hxx
index b39782c..689fe5a 100644
--- a/binfilter/inc/bf_svtools/svarray.hxx
+++ b/binfilter/inc/bf_svtools/svarray.hxx
@@ -936,7 +936,7 @@ public:\
 #define C40_PTR_REPLACE( c, p) Replace( (c const *) p )
 #define C40_GETPOS( c, r) GetPos( (c const *)r )
 #else
-#if defined WTC || defined ICC || defined HPUX || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400)
+#if defined WTC || defined ICC|| (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400)
 #define C40_INSERT( c, p, n ) Insert( (c const *&) p, n )
 #define C40_PUSH( c, p) Push( (c const *&) p )
 #define C40_PTR_INSERT( c, p ) Insert( (c const *&) p )
diff --git a/hwpfilter/source/grammar.cpp b/hwpfilter/source/grammar.cpp
index 15ff72e..76cb457 100644
--- a/hwpfilter/source/grammar.cpp
+++ b/hwpfilter/source/grammar.cpp
@@ -444,13 +444,6 @@ static const short yycheck[] = {    11,
  #pragma alloca
 #define YYSTACK_USE_ALLOCA
 #else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible at ilog.fr says this works for HPUX 9.05 and up,
-         and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
 #endif /* not _AIX */
 #endif /* not MSDOS, or __TURBOC__ */
 #endif /* not sparc */