[Libreoffice-commits] .: rsc/source

Thomas Arnhold tarnhold at kemper.freedesktop.org
Mon Feb 21 09:52:08 PST 2011


 rsc/source/parser/rsckey.cxx |    4 ----
 rsc/source/rsc/rsc.cxx       |    7 -------
 rsc/source/rscpp/cpp3.c      |    4 ++--
 rsc/source/rscpp/cpp4.c      |    4 ----
 rsc/source/rscpp/cpp5.c      |    2 --
 rsc/source/rscpp/cpp6.c      |    2 --
 6 files changed, 2 insertions(+), 21 deletions(-)

New commits:
commit 720e9dd1c1a505dec57d9d763cf734930fc47c23
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Feb 21 18:51:58 2011 +0100

    Remove ZTC support
    
    Obsolete Zortech compiler

diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx
index f887167..12cdc6e 100644
--- a/rsc/source/parser/rsckey.cxx
+++ b/rsc/source/parser/rsckey.cxx
@@ -45,15 +45,11 @@
 /****************** C o d e **********************************************/
 /****************** keyword sort function ********************************/
 extern "C" {
-#if defined( ZTC ) && defined( PM2 )
-    int __CLIB KeyCompare( const void * pFirst, const void * pSecond );
-#else
 #if defined( WNT ) && !defined (ICC)
     int _cdecl KeyCompare( const void * pFirst, const void * pSecond );
 #else
     int KeyCompare( const void * pFirst, const void * pSecond );
 #endif
-#endif
 }
 
 #if defined( WNT ) && !defined(ICC)
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 2a53501..4a67e05 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -50,13 +50,6 @@
 #include <ctype.h>
 #include <errno.h>
 
-#if defined( PM2 ) && defined( ZTC )
-#include <svpm.h>
-#ifndef unlink
-#define unlink( p ) DosDelete( (PSZ)(const char*)p )
-#endif
-#endif
-
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 #include <rscerror.h>
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index a77bd6b..47ba920 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -170,7 +170,7 @@ void setincdirs()
  * verwendete knallte es in strcpy() !
  */
 
-#if !defined( ZTC ) && !defined( WNT ) && ! defined UNX && ! defined OS2
+#if !defined( WNT ) && ! defined UNX && ! defined OS2
         extern   char     *getenv( char *pStr ); /* BP */
 #endif
                  char     *pIncGetEnv = NULL;    /* Pointer auf INCLUDE   */
@@ -465,7 +465,7 @@ void initdefines()
         int                     i;
         time_t                  tvec;
 
-#if !defined( ZTC ) && !defined( WNT ) && !defined(G3)
+#if !defined( WNT ) && !defined(G3)
         extern char             *ctime();
 #endif
 
diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c
index 0f77a19..7f189d0 100644
--- a/rsc/source/rscpp/cpp4.c
+++ b/rsc/source/rscpp/cpp4.c
@@ -405,9 +405,7 @@ void expand(DEFBUF* tokenp)
 {
         register int            c;
         register FILEINFO       *file;
-#ifndef ZTC  /* BP */
     extern FILEINFO     *getfile();
-#endif
 
 #if OSL_DEBUG_LEVEL > 1
         if (debug)
@@ -563,9 +561,7 @@ void expstuff(DEFBUF* tokenp)
         char            *defend;                /* -> output buff end   */
         int             string_magic;           /* String formal hack   */
         FILEINFO        *file;                  /* Funny #include       */
-#ifndef ZTC  /* BP */
     extern FILEINFO *getfile();
-#endif
 
         file = getfile(NBUFF, tokenp->name);
         inp = tokenp->repl;                     /* -> macro replacement */
diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 9b4484f..4b2c63f 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -236,9 +236,7 @@ eval()
     int		skip;		/* For short-circuit testing	*/
     int		value[NEXP];	/* Value stack			*/
     OPTAB		opstack[NEXP];	/* Operand stack		*/
-#ifndef ZTC  /* BP */
     extern int  *evaleval();    /* Does actual evaluation   */
-#endif
     valp = value;
     opp = opstack;
     opp->op = OP_END;		/* Mark bottom of stack		*/
diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c
index 2bbf161..3bd056d 100644
--- a/rsc/source/rscpp/cpp6.c
+++ b/rsc/source/rscpp/cpp6.c
@@ -1030,9 +1030,7 @@ void ungetstring(char* text)
  */
 {
         register FILEINFO       *file;
-#ifndef ZTC /* BP */
         extern FILEINFO         *getfile();
-#endif
         file = getfile(strlen(text) + 1, "");
         strcpy(file->buffer, text);
 }


More information about the Libreoffice-commits mailing list