summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--soltools/checkdll/makefile.mk6
-rw-r--r--soltools/cpp/_cpp.c4
-rw-r--r--soltools/cpp/_include.c5
-rw-r--r--soltools/cpp/_lex.c16
-rw-r--r--soltools/cpp/_macro.c3
-rw-r--r--soltools/cpp/_tokens.c2
-rw-r--r--soltools/cpp/_unix.c2
-rw-r--r--soltools/cpp/cpp.h8
-rw-r--r--soltools/cpp/makefile.mk5
-rw-r--r--soltools/javadep/makefile.mk5
-rw-r--r--soltools/ldump/ldump.cxx10
-rw-r--r--soltools/ldump/makefile.mk8
-rw-r--r--soltools/mkdepend/makefile.mk5
-rw-r--r--soltools/testSHL/makefile.mk7
14 files changed, 38 insertions, 48 deletions
diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk
index 61b1b7e0e5e1..2f4da0fe0624 100644
--- a/soltools/checkdll/makefile.mk
+++ b/soltools/checkdll/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: hr $ $Date: 2002-10-22 10:51:53 $
+# last change: $Author: hr $ $Date: 2003-03-18 12:47:33 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -74,7 +74,9 @@ NO_DEFAULT_STL=TRUE
# --- Files --------------------------------------------------------
+
.IF "$(GUI)"=="UNX"
+LIBSALCPPRT=$(0)
APP1TARGET = checkdll
APP1OBJS = $(OBJ)$/checkdll.obj
DEPOBJFILES = $(APP1OBJS)
diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c
index 56520d8a3a65..1f69d399dc6e 100644
--- a/soltools/cpp/_cpp.c
+++ b/soltools/cpp/_cpp.c
@@ -17,7 +17,7 @@ int ifdepth;
int ifsatisfied[NIF];
int skipping;
-char rcsid[] = "$Version 1.2 $ $Revision: 1.2 $ $Date: 2001-07-10 08:57:52 $";
+char rcsid[] = "$Version 1.2 $ $Revision: 1.3 $ $Date: 2003-03-18 12:47:33 $";
int
#ifdef _WIN32
@@ -51,7 +51,7 @@ __cdecl
void
process(Tokenrow * trp)
{
- int anymacros = 0; /* S390: XDBX stürzt ab! */
+ int anymacros = 0;
for (;;)
{
diff --git a/soltools/cpp/_include.c b/soltools/cpp/_include.c
index 95334dc6afd7..45f0b2bfe2ef 100644
--- a/soltools/cpp/_include.c
+++ b/soltools/cpp/_include.c
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__)) && !(defined S390)
+#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
# include <io.h>
#else
# include <unistd.h>
@@ -14,9 +14,6 @@
#ifdef _MSC_VER
# define _POSIX_
#endif
-#ifdef S390
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
#ifdef __IBMC__
# include <fcntl.h>
# define PATH_MAX _MAX_PATH
diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c
index 96bfd47f4179..da5cb02cf083 100644
--- a/soltools/cpp/_lex.c
+++ b/soltools/cpp/_lex.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__)) && !(defined S390)
+#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
#include <io.h>
#else
#include <unistd.h>
@@ -37,11 +37,7 @@
#define C_ALPH 2
#define C_NUM 3
#define C_EOF 4
-#ifdef S390
-#define C_XX 6
-#else
#define C_XX 5
-#endif
enum state
{
@@ -268,12 +264,8 @@ void
continue;
case C_ALPH:
for (j = 0; j <= 256; j++)
-#ifdef S390
- if( isalpha( j ) || (j == '_') )
-#else
if ('a' <= j && j <= 'z' || 'A' <= j && j <= 'Z'
|| j == '_')
-#endif
bigfsm[j][fp->state] = nstate;
continue;
case C_NUM:
@@ -351,7 +343,7 @@ int
}
}
maxp = &trp->bp[trp->max];
- runelen = 1; /* S390: XDBX stürzt ab! */
+ runelen = 1;
for (;;)
{
continue2:
@@ -370,7 +362,7 @@ continue2:
{
oldstate = state;
- c = *ip; /* S390: XDBX stürzt (gelegentlich) ab! */
+ c = *ip;
if ((state = bigfsm[c][state]) >= 0)
{
@@ -416,7 +408,7 @@ continue2:
if (c == '\n')
{
- while (s->inp + 1 >= s->inl && fillbuf(s) != EOF); /* S390: XDBX stürzt (manchmal) ab! */
+ while (s->inp + 1 >= s->inl && fillbuf(s) != EOF);
if (s->inp[1] == '\r')
{
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index f47d74c96143..1b2f4c4a1742 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -8,9 +8,6 @@
#ifdef _MSC_VER
# define _POSIX_
#endif
-#ifdef S390
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
#ifdef __IBMC__
# define PATH_MAX _MAX_PATH
#endif
diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c
index b5b616bbd13a..ef2d33812829 100644
--- a/soltools/cpp/_tokens.c
+++ b/soltools/cpp/_tokens.c
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__)) && !(defined S390)
+#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
#include <io.h>
#else
#include <unistd.h>
diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c
index 1a6fa2f33bfd..7884528f2a97 100644
--- a/soltools/cpp/_unix.c
+++ b/soltools/cpp/_unix.c
@@ -4,7 +4,7 @@
#include <string.h>
#include <ctype.h>
#include <fcntl.h>
-#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__)) && !(defined S390)
+#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
#include <io.h>
#else
#include <unistd.h>
diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h
index 61be961844ef..d79da383261c 100644
--- a/soltools/cpp/cpp.h
+++ b/soltools/cpp/cpp.h
@@ -1,4 +1,4 @@
-/* $Id: cpp.h,v 1.2 2002-01-08 12:07:30 hjs Exp $ */
+/* $Id: cpp.h,v 1.3 2003-03-18 12:47:34 hr Exp $ */
#define INS 32768 /* input buffer */
#define OBS 8092 /* outbut buffer */
@@ -47,14 +47,8 @@ enum kwtype
#define ISARCHITECTURE 0x10 /* architecture */
#define ISACTIVE 0x80 /* is macro currently expanded */
-#ifdef S390
-/* 0xfe und 0xfd fallen auf der S/390 auf Control-Chars */
-#define EOB 0x07
-#define EOFC 0x08
-#else
#define EOB 0xFE /* sentinel for end of input buffer */
#define EOFC 0xFD /* sentinel for end of input file */
-#endif
#define XPWS 1 /* token flag: white space to assure token sep. */
#define XTWS 2
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index 2d5a12df01f0..a30ea7cb7871 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.8 $
#
-# last change: $Author: rt $ $Date: 2002-12-11 14:00:23 $
+# last change: $Author: hr $ $Date: 2003-03-18 12:47:35 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -74,6 +74,7 @@ NO_DEFAULT_STL=TRUE
.INCLUDE : settings.mk
UWINAPILIB=$(0)
+LIBSALCPPRT=$(0)
# --- Files --------------------------------------------------------
diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk
index b1034e06e583..f062ecfe9f22 100644
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: rt $ $Date: 2002-12-11 14:00:22 $
+# last change: $Author: hr $ $Date: 2003-03-18 12:47:36 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -74,6 +74,7 @@ NO_DEFAULT_STL=TRUE
.INCLUDE : settings.mk
UWINAPILIB=$(0)
+LIBSALCPPRT=$(0)
# --- Files --------------------------------------------------------
diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx
index b06c508abe8e..fd1a4637a762 100644
--- a/soltools/ldump/ldump.cxx
+++ b/soltools/ldump/ldump.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ldump.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: hjs $ $Date: 2002-06-20 12:40:46 $
+ * last change: $Author: hr $ $Date: 2003-03-18 12:47:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -470,7 +470,7 @@ bool LibDump::PrintDataBase()
FILE *pFp;
pFp = fopen (cBName,"w+");
if (!pFp)
- DumpError( 600 );
+ fprintf( stderr, "Error opening DataBase File\n" );
LibExport *pData;
for ( unsigned long i=0; i < nBaseLines+10; i++ )
@@ -618,7 +618,7 @@ bool LibDump::DumpError( unsigned long n )
case 610: p = "Overflow in base database table\n"; break;
default: p = "Unspecified error";
}
- fprintf( stderr, "Error\n\n%s\n", p );
+ fprintf( stdout, "%s\n", p );
exit (1);
return false;
}
@@ -628,7 +628,7 @@ bool LibDump::DumpError( unsigned long n )
*********************************************************************/
-int usage()
+usage()
{
LibDump::DumpError(99);
exit(0);
diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk
index 6aacc9cd9311..6c5e3489fbc6 100644
--- a/soltools/ldump/makefile.mk
+++ b/soltools/ldump/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: hr $ $Date: 2002-02-22 10:20:06 $
+# last change: $Author: hr $ $Date: 2003-03-18 12:47:37 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -65,13 +65,15 @@ PRJ=..
PRJNAME=ldump
TARGET=ldump
TARGETTYPE=CUI
-NO_DEFAULT_STL=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk
+UWINAPILIB=$(0)
+LIBSALCPPRT=$(0)
+
# --- Files --------------------------------------------------------
# ldump only supports windows environment
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index ce6e157ea78c..5c8486f5a05c 100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.8 $
#
-# last change: $Author: rt $ $Date: 2002-12-11 14:00:21 $
+# last change: $Author: hr $ $Date: 2003-03-18 12:47:37 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -73,6 +73,7 @@ nodep=true
.INCLUDE : settings.mk
dot=.
+LIBSALCPPRT=$(0)
UWINAPILIB=$(0)
CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS -DINCLUDEDIR=\".\"
diff --git a/soltools/testSHL/makefile.mk b/soltools/testSHL/makefile.mk
index b76f006ff2a7..f00fd8307c80 100644
--- a/soltools/testSHL/makefile.mk
+++ b/soltools/testSHL/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: hjs $ $Date: 2002-01-08 12:07:30 $
+# last change: $Author: hr $ $Date: 2003-03-18 12:47:38 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -70,6 +70,9 @@ TARGETTYPE=CUI
.INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk
+UWINAPILIB=$(0)
+LIBSALCPPRT=$(0)
+
# ------------------------------------------------------------------
APP1TARGET= $(TARGET)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 00:50:19 +0000