diff options
author | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2010-11-25 18:25:48 +0100 |
---|---|---|
committer | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2010-11-25 18:25:48 +0100 |
commit | e1739410c0a7667759f24c38e859649a18b06eb0 (patch) | |
tree | 54c67ebe1563930f99694f5f8f59f23d6c35d5a1 /soltools | |
parent | Update from master repository (DEV300 masterfix). (diff) | |
parent | Update from sibling repository. (diff) | |
download | core-e1739410c0a7667759f24c38e859649a18b06eb0.tar.gz core-e1739410c0a7667759f24c38e859649a18b06eb0.zip |
Update from sibling repository.
Diffstat (limited to 'soltools')
-rw-r--r-- | soltools/cpp/_eval.c | 13 | ||||
-rw-r--r-- | soltools/cpp/_lex.c | 2 | ||||
-rw-r--r-- | soltools/cpp/cpp.h | 3 | ||||
-rw-r--r-- | soltools/prj/build.lst | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | soltools/util/makefile.pmk | 4 |
5 files changed, 13 insertions, 11 deletions
diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c index a652e488d78f..a6406faed788 100644 --- a/soltools/cpp/_eval.c +++ b/soltools/cpp/_eval.c @@ -1,6 +1,7 @@ +#include "cpp.h" + #include <stdlib.h> #include <string.h> -#include "cpp.h" #define NSTAK 32 #define SGN 0 @@ -711,11 +712,11 @@ struct value } else { - static char cvcon[] - = "b\bf\fn\nr\rt\tv\v''\"\"??\\\\"; - size_t j; + static char cvcon[] = "b\bf\fn\nr\rt\tv\v''\"\"??\\\\"; + static size_t cvlen = sizeof(cvcon) - 1; - for (j = 0; j < sizeof(cvcon); j += 2) + size_t j; + for (j = 0; j < cvlen; j += 2) { if (*p == cvcon[j]) { @@ -724,7 +725,7 @@ struct value } } p += 1; - if (j >= sizeof(cvcon)) + if (j >= cvlen) error(WARNING, "Undefined escape in character constant"); } diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c index 2ff188ff2264..2236fd9db260 100644 --- a/soltools/cpp/_lex.c +++ b/soltools/cpp/_lex.c @@ -262,7 +262,7 @@ void bigfsm[j][fp->state] = (short) nstate; continue; case C_ALPH: - for (j = 0; j <= 256; j++) + for (j = 0; j < 256; j++) #ifdef S390 if( isalpha( j ) || (j == '_') ) #else diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h index da609dbe53c1..34e18579c35a 100644 --- a/soltools/cpp/cpp.h +++ b/soltools/cpp/cpp.h @@ -15,11 +15,8 @@ #define NULL 0 #endif -#ifndef __alpha typedef unsigned char uchar; -#endif - enum toktype { END, UNCLASS, NAME, NUMBER, STRING, CCON, NL, WS, DSHARP, diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst index 3c4e50eb0cda..73611addf782 100644 --- a/soltools/prj/build.lst +++ b/soltools/prj/build.lst @@ -1,4 +1,4 @@ -so soltools : SUN:so_prereq NULL +so soltools : solenv SUN:so_prereq NULL so soltools usr1 - all so_usr1 NULL so soltools\inc get - all so_inc NULL so soltools\ldump nmake - all so_ldump so_mkdep NULL diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk index 33c04cf547eb..bf51cf851b4c 100644..100755 --- a/soltools/util/makefile.pmk +++ b/soltools/util/makefile.pmk @@ -34,6 +34,10 @@ ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility # avoid STLPort NO_DEFAULT_STL=TRUE SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC)) +.IF "$(STLPORT4)" != "" +SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) +SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) +.ENDIF .IF "$(OS)"=="SOLARIS" # hack due to #i53089# |