From: Ulrich Wilkens Date: Fri, 1 Jun 2018 01:55:10 +0000 (+0200) Subject: Fix warnings on FreeBSD X-Git-Tag: 2.2.4a~22 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=297b6bd84552bde1b02ae56296219b626782f80c;p=oweals%2Fcde.git Fix warnings on FreeBSD --- diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf index 929b2c61..b25e9a60 100644 --- a/cde/config/cf/FreeBSD.cf +++ b/cde/config/cf/FreeBSD.cf @@ -117,6 +117,7 @@ USE_GCC = UseGcc #define HasMakefileSafeInclude YES #define IncludeMakefile(file) HASH_SIGN dependencies are in .depend #define DependFileName .depend +#define DependDefines -D__cplusplus #if OSMajorVersion < 3 #if OSMinorVersion < 2 #ifndef ExtraLibraries diff --git a/cde/config/makedepend/ifparser.c b/cde/config/makedepend/ifparser.c index d950f82a..b06a4fd1 100644 --- a/cde/config/makedepend/ifparser.c +++ b/cde/config/makedepend/ifparser.c @@ -81,6 +81,7 @@ #include "ifparser.h" #include +#include #include #include @@ -201,7 +202,7 @@ parse_value (g, cp, valp) const char *cp; long *valp; { - const char *var; + const char *var, *varend; *valp = 0; @@ -228,6 +229,16 @@ parse_value (g, cp, valp) *valp = -(*valp); return cp; + case '+': + DO (cp = parse_value (g, cp + 1, valp)); + *valp = +(*valp); + return cp; + + case '~': + DO (cp = parse_value (g, cp + 1, valp)); + *valp = ~(*valp); + return cp; + case '#': DO (cp = parse_variable (g, cp + 1, &var)); SKIPSPACE (cp); @@ -276,7 +287,24 @@ parse_value (g, cp, valp) return CALLFUNC(g, handle_error) (g, cp, "variable or number"); else { DO (cp = parse_variable (g, cp, &var)); - *valp = (*(g->funcs.eval_variable)) (g, var, cp - var); + varend = cp; + SKIPSPACE(cp); + if (*cp != '(') { + *valp = (*(g->funcs.eval_variable)) (g, var, varend - var); + } else { + do { + long dummy; + DO (cp = ParseIfExpression (g, cp + 1, &dummy)); + SKIPSPACE(cp); + if (*cp == ')') + break; + if (*cp != ',') + return CALLFUNC(g, handle_error) (g, cp, ","); + } while (1); + + *valp = 1; /* XXX */ + cp++; + } } return cp; @@ -464,7 +492,7 @@ parse_band (g, cp, valp) static const char * -parse_bor (g, cp, valp) +parse_bxor (g, cp, valp) IfParser *g; const char *cp; long *valp; @@ -474,6 +502,27 @@ parse_bor (g, cp, valp) DO (cp = parse_band (g, cp, valp)); SKIPSPACE (cp); + switch (*cp) { + case '^': + DO (cp = parse_bxor (g, cp + 1, &rightval)); + *valp = (*valp ^ rightval); + break; + } + return cp; +} + + +static const char * +parse_bor (g, cp, valp) + IfParser *g; + const char *cp; + long *valp; +{ + long rightval; + + DO (cp = parse_bxor (g, cp, valp)); + SKIPSPACE (cp); + switch (*cp) { case '|': if (cp[1] != '|') { diff --git a/cde/lib/DtHelp/AsciiSpc.c b/cde/lib/DtHelp/AsciiSpc.c index 4037d3e7..bf610ee3 100644 --- a/cde/lib/DtHelp/AsciiSpc.c +++ b/cde/lib/DtHelp/AsciiSpc.c @@ -75,61 +75,61 @@ static SpecialSymbolTable SpcTable[] = * The last entry will catch them and map them to a blank * anyway. This will shorten the table by quite a bit. */ - /*{"[aacute]", " " }, /*ISOlat1, small a, acute accent */ - /*{"[acirc ]", " " }, /*ISOlat1, small a, circumflex */ - /*{"[aelig ]", " " }, /*ISOlat1, small ae diphthong */ - /*{"[agrave]", " " }, /*ISOlat1, small a, grave accent */ - /*{"[alpha ]", " " }, /*ISOgrk3, Greek, small alpha */ - /*{"[aleph ]", " " }, /*ISOtech, aleph, Hebrews */ + /*{"[aacute]", " " }, *ISOlat1, small a, acute accent */ + /*{"[acirc ]", " " }, *ISOlat1, small a, circumflex */ + /*{"[aelig ]", " " }, *ISOlat1, small ae diphthong */ + /*{"[agrave]", " " }, *ISOlat1, small a, grave accent */ + /*{"[alpha ]", " " }, *ISOgrk3, Greek, small alpha */ + /*{"[aleph ]", " " }, *ISOtech, aleph, Hebrews */ {"[amp ]", "&" }, /*ISOnum , ampersand */ {"[and ]", "^" }, /*ISOtech, wedge, logical and */ - /*{"[ang ]", " " }, /*ISOamso, angle */ - /*{"[angst ]", " " }, /*ISOtech, Angstrom, cap A, ring */ + /*{"[ang ]", " " }, *ISOamso, angle */ + /*{"[angst ]", " " }, *ISOtech, Angstrom, cap A, ring */ {"[ap ]", "~=" }, /*ISOtech, approximately equal */ {"[apos ]", "'" }, /*ISOnum , apostrophe */ - /*{"[aring ]", " " }, /*ISOlat1, small a, ring */ + /*{"[aring ]", " " }, *ISOlat1, small a, ring */ {"[ast ]", "*" }, /*ISOnum , asterisk */ - /*{"[atilde]", " " }, /*ISOlat1, small a, tilde */ - /*{"[auml ]", " " }, /*ISOlat1, small a, umlaut mark */ - /*{"[beta ]", " " }, /*ISOgrk3, Greek, small beta */ - /*{"[blank ]", " " }, /*ISOpub , significant blank */ - /*{"[bottom]", " " }, /*ISOtech, bottom symbol */ + /*{"[atilde]", " " }, *ISOlat1, small a, tilde */ + /*{"[auml ]", " " }, *ISOlat1, small a, umlaut mark */ + /*{"[beta ]", " " }, *ISOgrk3, Greek, small beta */ + /*{"[blank ]", " " }, *ISOpub , significant blank */ + /*{"[bottom]", " " }, *ISOtech, bottom symbol */ {"[bsol ]", "\\" }, /*ISOnum , backslash, rev solidus*/ {"[bull ]", "*" }, /*ISOpub , round bullet,filled */ - /*{"[brvbar]", "|" }, /*ISOnum , broken vertical bar */ - /*{"[cap ]", " " }, /*ISOtech, intersection */ - /*{"[ccedil]", " " }, /*ISOlat1, small c, cedilla */ - /*{"[cent ]", " " }, /*ISOnum , cent sign */ - /*{"[chi ]", " " }, /*ISOgrk3, Greek, small chi */ - /*{"[clubs ]", " " }, /*ISOpub , clubs suit symbol */ + /*{"[brvbar]", "|" }, *ISOnum , broken vertical bar */ + /*{"[cap ]", " " }, *ISOtech, intersection */ + /*{"[ccedil]", " " }, *ISOlat1, small c, cedilla */ + /*{"[cent ]", " " }, *ISOnum , cent sign */ + /*{"[chi ]", " " }, *ISOgrk3, Greek, small chi */ + /*{"[clubs ]", " " }, *ISOpub , clubs suit symbol */ {"[colon ]", ":" }, /*ISOnum , colon */ {"[comma ]", "," }, /*ISOnum , comma */ {"[commat]", "@" }, /*ISOnum , commercial at */ - /*{"[cong ]", " " }, /*ISOtech, congruent with */ - /*{"[copy ]", " " }, /*ISOnum , copyright symbol */ + /*{"[cong ]", " " }, *ISOtech, congruent with */ + /*{"[copy ]", " " }, *ISOnum , copyright symbol */ {"[cup ]", "U" }, /*ISOtech, union or logical sum */ - /*{"[curren]", " " }, /*ISOnum , general currency sign */ - /*{"[darr ]", " " }, /*ISOnum , downward arrow */ - /*{"[dArr ]", " " }, /*ISOamsa, down double arrow */ + /*{"[curren]", " " }, *ISOnum , general currency sign */ + /*{"[darr ]", " " }, *ISOnum , downward arrow */ + /*{"[dArr ]", " " }, *ISOamsa, down double arrow */ {"[dash ]", "-" }, /*ISOpub , dash */ - /*{"[deg ]", " " }, /*ISOnum , degree sign */ - /*{"[delta ]", " " }, /*ISOgrk3, Greek, small delta */ - /*{"[diams ]", " " }, /*ISOpub , diamond suit symbol */ + /*{"[deg ]", " " }, *ISOnum , degree sign */ + /*{"[delta ]", " " }, *ISOgrk3, Greek, small delta */ + /*{"[diams ]", " " }, *ISOpub , diamond suit symbol */ {"[divide]", "/" }, /*ISOnum , divide sign */ {"[dollar]", "$" }, /*ISOnum , dollar sign */ - /*{"[eacute]", " " }, /*ISOlat1, small e, acute accent */ - /*{"[ecirc ]", " " }, /*ISOlat1, small e, circumflex */ - /*{"[egrave]", " " }, /*ISOlat1, small e, grave accent */ - /*{"[empty ]", " " }, /*ISOamso, empty string, o/slash */ - /*{"[epsiv ]", " " }, /*ISOgrk3, Greek,sm epsilon, var */ + /*{"[eacute]", " " }, *ISOlat1, small e, acute accent */ + /*{"[ecirc ]", " " }, *ISOlat1, small e, circumflex */ + /*{"[egrave]", " " }, *ISOlat1, small e, grave accent */ + /*{"[empty ]", " " }, *ISOamso, empty string, o/slash */ + /*{"[epsiv ]", " " }, *ISOgrk3, Greek,sm epsilon, var */ {"[equals]", "=" }, /*ISOnum , equals sign */ - /*{"[equiv ]", " " }, /*ISOtech, identical with */ - /*{"[eta ]", " " }, /*ISOgrk3, Greek, small eta */ - /*{"[eth ]", " " }, /*ISOlat1, small eth, Icelandic */ - /*{"[euml ]", " " }, /*ISOlat1, small e, umlaut mark */ + /*{"[equiv ]", " " }, *ISOtech, identical with */ + /*{"[eta ]", " " }, *ISOgrk3, Greek, small eta */ + /*{"[eth ]", " " }, *ISOlat1, small eth, Icelandic */ + /*{"[euml ]", " " }, *ISOlat1, small e, umlaut mark */ {"[excl ]", "!" }, /*ISOnum , exclamation mark */ - /*{"[exist ]", " " }, /*ISOtech, at least one exists */ - /*{"[forall]", " " }, /*ISOtech, for all */ + /*{"[exist ]", " " }, *ISOtech, at least one exists */ + /*{"[forall]", " " }, *ISOtech, for all */ {"[frac12]", "1/2" }, /*ISOnum , fraction one-half */ {"[frac13]", "1/3" }, /*ISOnum , fraction one-third */ {"[frac14]", "1/4" }, /*ISOnum , fraction one-quarter */ @@ -145,30 +145,30 @@ static SpecialSymbolTable SpcTable[] = {"[frac56]", "5/6" }, /*ISOnum , fraction five-sixths */ {"[frac58]", "5/8" }, /*ISOnum , fraction five-eights */ {"[frac78]", "7/8" }, /*ISOnum , fraction seven-eights */ - /*{"[gamma ]", " " }, /*ISOgrk3, Greek, small gamma */ + /*{"[gamma ]", " " }, *ISOgrk3, Greek, small gamma */ {"[ge ]", ">=" }, /*ISOtech, greater-than-or-equal */ {"[gt ]", ">" }, /*ISOnum , greater than sign */ {"[half ]", "1/2" }, /*ISOnum , fraction one-half */ {"[harr ]", "<-->" }, /*ISOamsa, left & right arrow */ {"[hArr ]", "<<==>>" }, /*ISOamsa, l & r double arrow */ - /*{"[hearts]", " " }, /*ISOpub , hearts suit symbol */ + /*{"[hearts]", " " }, *ISOpub , hearts suit symbol */ {"[hellip]", "..." }, /*ISOpub , ellipsis(horizontal) */ {"[horbar]", "--" }, /*ISOnum , horizontal bar */ {"[hyphen]", "-" }, /*ISOnum , hyphen */ - /*{"[iacute]", " " }, /*ISOlat1, small i, acute accent */ - /*{"[icirc ]", " " }, /*ISOlat1, small i, circumflex */ - /*{"[iexcl ]", " " }, /*ISOnum , inverted ! mark */ - /*{"[igrave]", " " }, /*ISOlat1, small i, grave accent */ - /*{"[image ]", " " }, /*ISOamso,imaginary number symbol*/ - /*{"[infin ]", " " }, /*ISOtech, infinity */ - /*{"[int ]", " " }, /*ISOtech, intergral operator */ - /*{"[iota ]", " " }, /*ISOgrk3, Greek, small iota */ - /*{"[iquest]", " " }, /*ISOnum , inverted ? mark */ - /*{"[isin ]", " " }, /*ISOtech, set membership */ - /*{"[iuml ]", " " }, /*ISOlat1, small i, umlaut mark */ - /*{"[kappa ]", " " }, /*ISOgrk3, Greek, small kappa */ - /*{"[lambda]", " " }, /*ISOgrk3, Greek, small lambda */ - /*{"[lang ]", " " }, /*ISOtech, left angle bracket */ + /*{"[iacute]", " " }, *ISOlat1, small i, acute accent */ + /*{"[icirc ]", " " }, *ISOlat1, small i, circumflex */ + /*{"[iexcl ]", " " }, *ISOnum , inverted ! mark */ + /*{"[igrave]", " " }, *ISOlat1, small i, grave accent */ + /*{"[image ]", " " }, *ISOamso,imaginary number symbol*/ + /*{"[infin ]", " " }, *ISOtech, infinity */ + /*{"[int ]", " " }, *ISOtech, intergral operator */ + /*{"[iota ]", " " }, *ISOgrk3, Greek, small iota */ + /*{"[iquest]", " " }, *ISOnum , inverted ? mark */ + /*{"[isin ]", " " }, *ISOtech, set membership */ + /*{"[iuml ]", " " }, *ISOlat1, small i, umlaut mark */ + /*{"[kappa ]", " " }, *ISOgrk3, Greek, small kappa */ + /*{"[lambda]", " " }, *ISOgrk3, Greek, small lambda */ + /*{"[lang ]", " " }, *ISOtech, left angle bracket */ {"[laquo ]", "<<" }, /*ISOnum , left angle quotation */ {"[larr ]", "<--" }, /*ISOnum , leftward arrow */ {"[lArr ]", "<==" }, /*ISOtech, is implied by */ @@ -182,153 +182,153 @@ static SpecialSymbolTable SpcTable[] = {"[lsquor]", "," }, /*ISOnum,rising single quote(low)*/ {"[lt ]", "<" }, /*ISOnum , less-than sign */ {"[mdash ]", "--" }, /*ISOpub , em dash(long dash) */ - /*{"[micro ]", " " }, /*ISOnum , micro */ - /*{"[middot]", " " }, /*ISOnum , middle dot */ + /*{"[micro ]", " " }, *ISOnum , micro */ + /*{"[middot]", " " }, *ISOnum , middle dot */ {"[minus ]", "-" }, /*ISOtech, minus sign */ {"[mldr ]", "...." }, /*ISOpub , em leader */ {"[mnplus]", "-/+" }, /*ISOtech, minus-or-plus sign */ - /*{"[mu ]", " " }, /*ISOgrk3, Greek, small mu */ - /*{"[nabla ]", " " }, /*ISOtech, del, Hamilton operator*/ + /*{"[mu ]", " " }, *ISOgrk3, Greek, small mu */ + /*{"[nabla ]", " " }, *ISOtech, del, Hamilton operator*/ {"[nbsp ]", " " }, /*ISOnum , no break space */ {"[ndash ]", "-" }, /*ISOpub , en dash(short dash) */ {"[ne ]", "!=" }, /*ISOtech, not equal */ - /*{"[ni ]", " " }, /*ISOtech, contains */ + /*{"[ni ]", " " }, *ISOtech, contains */ {"[nldr ]", ".." }, /*ISOpub , double baseline dot */ - /*{"[not ]", " " }, /*ISOnum , not */ - /*{"[notin ]", " " }, /*ISOtech, negated set membership*/ - /*{"[ntilde]", " " }, /*ISOlat1, small N, tilde */ - /*{"[nu ]", " " }, /*ISOgrk3, Greek, small nu */ + /*{"[not ]", " " }, *ISOnum , not */ + /*{"[notin ]", " " }, *ISOtech, negated set membership*/ + /*{"[ntilde]", " " }, *ISOlat1, small N, tilde */ + /*{"[nu ]", " " }, *ISOgrk3, Greek, small nu */ {"[num ]", "#" }, /*ISOnum , number sign */ - /*{"[oacute]", " " }, /*ISOlat1, small o, acute accent */ - /*{"[ocirc ]", " " }, /*ISOlat1, small o, circumflex */ - /*{"[ograve]", " " }, /*ISOlat1, small o, grave accent */ - /*{"[ohm ]", " " }, /*ISOnum , ohm */ - /*{"[omega ]", " " }, /*ISOgrk3, Greek, small omega */ - /*{"[oplus ]", " " }, /*ISOamsb, plus sign in circle */ + /*{"[oacute]", " " }, *ISOlat1, small o, acute accent */ + /*{"[ocirc ]", " " }, *ISOlat1, small o, circumflex */ + /*{"[ograve]", " " }, *ISOlat1, small o, grave accent */ + /*{"[ohm ]", " " }, *ISOnum , ohm */ + /*{"[omega ]", " " }, *ISOgrk3, Greek, small omega */ + /*{"[oplus ]", " " }, *ISOamsb, plus sign in circle */ {"[or ]", "V" }, /*ISOtech, vee, logical or */ - /*{"[ordf ]", " " }, /*ISOnum , ordinal indicator, fem*/ - /*{"[ordm ]", " " }, /*ISOnum , ordinal indicator,male*/ - /*{"[oslash]", " " }, /*ISOlat1, small o, slash */ - /*{"[osol ]", " " }, /*ISOamsb, slash in circle */ - /*{"[otilde]", " " }, /*ISOlat1, small o, tilde */ - /*{"[otimes]", " " }, /*ISOamsb,multiply sign in circle*/ - /*{"[ouml ]", " " }, /*ISOlat1, small o, umlaut mark */ - /*{"[over ]", " " }, /*made up, over symbol */ + /*{"[ordf ]", " " }, *ISOnum , ordinal indicator, fem*/ + /*{"[ordm ]", " " }, *ISOnum , ordinal indicator,male*/ + /*{"[oslash]", " " }, *ISOlat1, small o, slash */ + /*{"[osol ]", " " }, *ISOamsb, slash in circle */ + /*{"[otilde]", " " }, *ISOlat1, small o, tilde */ + /*{"[otimes]", " " }, *ISOamsb,multiply sign in circle*/ + /*{"[ouml ]", " " }, *ISOlat1, small o, umlaut mark */ + /*{"[over ]", " " }, *made up, over symbol */ {"[par ]", "||" }, /*ISOtech, parallel */ - /*{"[para ]", " " }, /*ISOnum , paragraph sign */ - /*{"[part ]", " " }, /*ISOtech, partial differential */ + /*{"[para ]", " " }, *ISOnum , paragraph sign */ + /*{"[part ]", " " }, *ISOtech, partial differential */ {"[percnt]", "%" }, /*ISOnum , percent sign */ {"[period]", "." }, /*ISOnum , full stop, period */ - /*{"[perp ]", " " }, /*ISOtech, perpendicular */ - /*{"[phis ]", " " }, /*ISOgrk3, Greek, small phi */ - /*{"[pi ]", " " }, /*ISOgrk3, Greek, small pi */ - /*{"[piv ]", " " }, /*ISOgrk3, Greek, small pi, var */ + /*{"[perp ]", " " }, *ISOtech, perpendicular */ + /*{"[phis ]", " " }, *ISOgrk3, Greek, small phi */ + /*{"[pi ]", " " }, *ISOgrk3, Greek, small pi */ + /*{"[piv ]", " " }, *ISOgrk3, Greek, small pi, var */ {"[plus ]", "+" }, /*ISOnum , plus sign */ {"[plusmn]", "+/-" }, /*ISOnum , plus or minus sign */ {"[pound ]", "#" }, /*ISOnum , pound sign */ {"[prime ]", "\'" }, /*ISOtech, prime or minute */ - /*{"[prop ]", " " }, /*ISOtech, proportional to */ - /*{"[psi ]", " " }, /*ISOgrk3, Greek, small psi */ + /*{"[prop ]", " " }, *ISOtech, proportional to */ + /*{"[psi ]", " " }, *ISOgrk3, Greek, small psi */ {"[quest ]", "?" }, /*ISOnum , question mark */ {"[quot ]", "'" }, /*ISOnum , quote mark */ - /*{"[radic ]", " " }, /*ISOtech, radical */ - /*{"[rang ]", " " }, /*ISOtech, right angle bracket */ + /*{"[radic ]", " " }, *ISOtech, radical */ + /*{"[rang ]", " " }, *ISOtech, right angle bracket */ {"[raquo ]", ">>" }, /*ISOnum , right angle quotation */ {"[rarr ]", "-->" }, /*ISOnum , rightward arrow */ {"[rArr ]", "==>>" }, /*ISOtech, right double arrow */ {"[rcub ]", "}" }, /*ISOnum , right curly brace */ {"[rdquo ]", "\"" }, /*ISOnum , right double quote */ - /*{"[real ]", " " }, /*ISOamso, real number symbol */ - /*{"[reg ]", " " }, /*ISOnum,circledR,registered sign*/ - /*{"[rho ]", " " }, /*ISOgrk3, Greek, small rho */ + /*{"[real ]", " " }, *ISOamso, real number symbol */ + /*{"[reg ]", " " }, *ISOnum,circledR,registered sign*/ + /*{"[rho ]", " " }, *ISOgrk3, Greek, small rho */ {"[rpar ]", ")" }, /*ISOnum , right parenthesis */ {"[rsqb ]", "]" }, /*ISOnum , right square bracket */ {"[rsquo ]", "'" }, /*ISOnum , right single quote */ - /*{"[sect ]", " " }, /*ISOnum , section sign */ + /*{"[sect ]", " " }, *ISOnum , section sign */ {"[semi ]", ";" }, /*ISOnum , semicolon */ {"[shy ]", "-" }, /*ISOnum , soft hypen */ - /*{"[sigma ]", " " }, /*ISOgrk3, Greek, small sigma */ + /*{"[sigma ]", " " }, *ISOgrk3, Greek, small sigma */ {"[sim ]", "~" }, /*ISOtech, similar to */ {"[sime ]", "~=" }, /*ISOtech, similar, equals */ {"[sol ]", "/" }, /*ISOnum , solidus */ - /*{"[spades]", " " }, /*ISOpub , spades suit symbol */ - /*{"[sub ]", " " }, /*ISOtech, subset/is implied by */ - /*{"[sung ]", " " }, /*ISOnum , musical note(sung txt)*/ - /*{"[sube ]", " " }, /*ISOtech, subset, equals */ - /*{"[sup ]", " " }, /*ISOtech, superset or implies */ - /*{"[sup1 ]", " " }, /*ISOnum , superscript one */ - /*{"[sup2 ]", " " }, /*ISOnum , superscript two */ - /*{"[sup3 ]", " " }, /*ISOnum , superscript three */ - /*{"[supe ]", " " }, /*ISOtech, superset, equals */ - /*{"[szlig ]", " " }, /*ISOlat1, small sharp s, German */ - /*{"[tau ]", " " }, /*ISOgrk3, Greek, small tau */ - /*{"[there4]", " " }, /*ISOtech, therefore */ - /*{"[thetas]", " " }, /*ISOgrk3, Greek, small theta */ - /*{"[thetav]", " " }, /*ISOgrk3, Greek, small theta,var*/ - /*{"[thorn ]", " " }, /*ISOlat1, small thorn, Icelandic*/ + /*{"[spades]", " " }, *ISOpub , spades suit symbol */ + /*{"[sub ]", " " }, *ISOtech, subset/is implied by */ + /*{"[sung ]", " " }, *ISOnum , musical note(sung txt)*/ + /*{"[sube ]", " " }, *ISOtech, subset, equals */ + /*{"[sup ]", " " }, *ISOtech, superset or implies */ + /*{"[sup1 ]", " " }, *ISOnum , superscript one */ + /*{"[sup2 ]", " " }, *ISOnum , superscript two */ + /*{"[sup3 ]", " " }, *ISOnum , superscript three */ + /*{"[supe ]", " " }, *ISOtech, superset, equals */ + /*{"[szlig ]", " " }, *ISOlat1, small sharp s, German */ + /*{"[tau ]", " " }, *ISOgrk3, Greek, small tau */ + /*{"[there4]", " " }, *ISOtech, therefore */ + /*{"[thetas]", " " }, *ISOgrk3, Greek, small theta */ + /*{"[thetav]", " " }, *ISOgrk3, Greek, small theta,var*/ + /*{"[thorn ]", " " }, *ISOlat1, small thorn, Icelandic*/ {"[times ]", "x" }, /*ISOnum , multipy sign */ {"[tprime]", "'''" }, /*ISOtech, triple prime */ - /*{"[trade ]", " " }, /*ISOnum , trade mark sign */ - /*{"[uacute]", " " }, /*ISOlat1, small u, acute accent */ - /*{"[ucirc ]", " " }, /*ISOlat1, small u, circumflex */ - /*{"[ugrave]", " " }, /*ISOlat1, small u, grave accent */ - /*{"[uarr ]", " " }, /*ISOnum , upward arrow */ - /*{"[uArr ]", " " }, /*ISOamsa, up double arrow */ - /*{"[upsi ]", " " }, /*ISOgrk3, Greek, small upsilon */ - /*{"[uuml ]", " " }, /*ISOlat1, small u, umlaut mark */ + /*{"[trade ]", " " }, *ISOnum , trade mark sign */ + /*{"[uacute]", " " }, *ISOlat1, small u, acute accent */ + /*{"[ucirc ]", " " }, *ISOlat1, small u, circumflex */ + /*{"[ugrave]", " " }, *ISOlat1, small u, grave accent */ + /*{"[uarr ]", " " }, *ISOnum , upward arrow */ + /*{"[uArr ]", " " }, *ISOamsa, up double arrow */ + /*{"[upsi ]", " " }, *ISOgrk3, Greek, small upsilon */ + /*{"[uuml ]", " " }, *ISOlat1, small u, umlaut mark */ {"[vellip]", ".\n.\n.\n" }, /*ISOpub , vertical ellipsis */ {"[verbar]", "|" }, /*ISOnum , vertical bar */ - /*{"[weierp]", " " }, /*ISOamso, Weierstrass p */ - /*{"[xi ]", " " }, /*ISOgrk3, Greek, small xi */ - /*{"[yacute]", " " }, /*ISOlat1, small y, acute accent */ - /*{"[yen ]", " " }, /*ISOnum , yen sign */ - /*{"[yuml ]", " " }, /*ISOlat1, small y, umlaut mark */ - /*{"[zeta ]", " " }, /*ISOgrk3, Greek, small zeta */ - /*{"[Aacute]", " " }, /*ISOlat1, capital a,acute accent*/ - /*{"[Acirc ]", " " }, /*ISOlat1, capital a,circumflex */ - /*{"[AElig ]", " " }, /*ISOlat1, capital ae diphthong */ - /*{"[Agrave]", " " }, /*ISOlat1, capital a,grave accent*/ - /*{"[Aring ]", " " }, /*ISOlat1, capital a,ring */ - /*{"[Atilde]", " " }, /*ISOlat1, capital a,tilde */ - /*{"[Auml ]", " " }, /*ISOlat1, capital a,umlaut mark */ - /*{"[Ccedil]", " " }, /*ISOlat1, capital c, cedilla */ - /*{"[Delta ]", " " }, /*ISOgrk3, Greek, large delta */ - /*{"[Dot ]", " " }, /*ISOtech, dieresis or umlaut mrk*/ - /*{"[DotDot]", " " }, /*ISOtech, four dots above */ - /*{"[Eacute]", " " }, /*ISOlat1, capital E,acute accent*/ - /*{"[Ecirc ]", " " }, /*ISOlat1, capital E,circumflex */ - /*{"[Egrave]", " " }, /*ISOlat1, capital E,grave accent*/ - /*{"[ETH ]", " " }, /*ISOlat1, capital Eth, Icelandic*/ - /*{"[Euml ]", " " }, /*ISOlat1, capital E,umlaut mark */ - /*{"[Gamma ]", " " }, /*ISOgrk3, Greek, large gamma */ - /*{"[Iacute]", " " }, /*ISOlat1, capital I,acute accent*/ - /*{"[Icirc ]", " " }, /*ISOlat1, capital I,circumflex */ - /*{"[Igrave]", " " }, /*ISOlat1, capital I,grave accent*/ - /*{"[Iuml ]", " " }, /*ISOlat1, capital I,umlaut mark */ - /*{"[Lambda]", " " }, /*ISOgrk3, Greek, large lambda */ - /*{"[Ntilde]", " " }, /*ISOlat1, capital N, tilde */ - /*{"[Oacute]", " " }, /*ISOlat1, capital O,acute accent*/ - /*{"[Ocirc ]", " " }, /*ISOlat1, capital O,circumflex */ - /*{"[Ograve]", " " }, /*ISOlat1, capital O,grave accent*/ - /*{"[Omega ]", " " }, /*ISOgrk3, Greek, large omega */ - /*{"[Oslash]", " " }, /*ISOlat1, capital O, slash */ - /*{"[Otilde]", " " }, /*ISOlat1, capital O, tilde */ - /*{"[Ouml ]", " " }, /*ISOlat1, capital O,umlaut mark */ - /*{"[Pi ]", " " }, /*ISOgrk3, Greek, large pi */ + /*{"[weierp]", " " }, *ISOamso, Weierstrass p */ + /*{"[xi ]", " " }, *ISOgrk3, Greek, small xi */ + /*{"[yacute]", " " }, *ISOlat1, small y, acute accent */ + /*{"[yen ]", " " }, *ISOnum , yen sign */ + /*{"[yuml ]", " " }, *ISOlat1, small y, umlaut mark */ + /*{"[zeta ]", " " }, *ISOgrk3, Greek, small zeta */ + /*{"[Aacute]", " " }, *ISOlat1, capital a,acute accent*/ + /*{"[Acirc ]", " " }, *ISOlat1, capital a,circumflex */ + /*{"[AElig ]", " " }, *ISOlat1, capital ae diphthong */ + /*{"[Agrave]", " " }, *ISOlat1, capital a,grave accent*/ + /*{"[Aring ]", " " }, *ISOlat1, capital a,ring */ + /*{"[Atilde]", " " }, *ISOlat1, capital a,tilde */ + /*{"[Auml ]", " " }, *ISOlat1, capital a,umlaut mark */ + /*{"[Ccedil]", " " }, *ISOlat1, capital c, cedilla */ + /*{"[Delta ]", " " }, *ISOgrk3, Greek, large delta */ + /*{"[Dot ]", " " }, *ISOtech, dieresis or umlaut mrk*/ + /*{"[DotDot]", " " }, *ISOtech, four dots above */ + /*{"[Eacute]", " " }, *ISOlat1, capital E,acute accent*/ + /*{"[Ecirc ]", " " }, *ISOlat1, capital E,circumflex */ + /*{"[Egrave]", " " }, *ISOlat1, capital E,grave accent*/ + /*{"[ETH ]", " " }, *ISOlat1, capital Eth, Icelandic*/ + /*{"[Euml ]", " " }, *ISOlat1, capital E,umlaut mark */ + /*{"[Gamma ]", " " }, *ISOgrk3, Greek, large gamma */ + /*{"[Iacute]", " " }, *ISOlat1, capital I,acute accent*/ + /*{"[Icirc ]", " " }, *ISOlat1, capital I,circumflex */ + /*{"[Igrave]", " " }, *ISOlat1, capital I,grave accent*/ + /*{"[Iuml ]", " " }, *ISOlat1, capital I,umlaut mark */ + /*{"[Lambda]", " " }, *ISOgrk3, Greek, large lambda */ + /*{"[Ntilde]", " " }, *ISOlat1, capital N, tilde */ + /*{"[Oacute]", " " }, *ISOlat1, capital O,acute accent*/ + /*{"[Ocirc ]", " " }, *ISOlat1, capital O,circumflex */ + /*{"[Ograve]", " " }, *ISOlat1, capital O,grave accent*/ + /*{"[Omega ]", " " }, *ISOgrk3, Greek, large omega */ + /*{"[Oslash]", " " }, *ISOlat1, capital O, slash */ + /*{"[Otilde]", " " }, *ISOlat1, capital O, tilde */ + /*{"[Ouml ]", " " }, *ISOlat1, capital O,umlaut mark */ + /*{"[Pi ]", " " }, *ISOgrk3, Greek, large pi */ {"[Prime ]", "\"" }, /*ISOtech, double prime/second */ - /*{"[Phi ]", " " }, /*ISOgrk3, Greek, large phi */ - /*{"[Psi ]", " " }, /*ISOgrk3, Greek, large psi */ - /*{"[Sigma ]", " " }, /*ISOgrk3, Greek, large sigma */ - /*{"[Theta ]", " " }, /*ISOgrk3, Greek, large theta */ - /*{"[THORN ]", " " }, /*ISOlat1,capital THORN,Icelandic*/ - /*{"[Uacute]", " " }, /*ISOgrk3, Greek, large theta */ - /*{"[Ucirc ]", " " }, /*ISOlat1, capital U,acute accent*/ - /*{"[Ugrave]", " " }, /*ISOlat1, capital U,circumflex */ - /*{"[Upsi ]", " " }, /*ISOgrk3, Greek, large upsilon */ - /*{"[Uuml ]", " " }, /*ISOlat1, capital U,umlaut mark */ + /*{"[Phi ]", " " }, *ISOgrk3, Greek, large phi */ + /*{"[Psi ]", " " }, *ISOgrk3, Greek, large psi */ + /*{"[Sigma ]", " " }, *ISOgrk3, Greek, large sigma */ + /*{"[Theta ]", " " }, *ISOgrk3, Greek, large theta */ + /*{"[THORN ]", " " }, *ISOlat1,capital THORN,Icelandic*/ + /*{"[Uacute]", " " }, *ISOgrk3, Greek, large theta */ + /*{"[Ucirc ]", " " }, *ISOlat1, capital U,acute accent*/ + /*{"[Ugrave]", " " }, *ISOlat1, capital U,circumflex */ + /*{"[Upsi ]", " " }, *ISOgrk3, Greek, large upsilon */ + /*{"[Uuml ]", " " }, *ISOlat1, capital U,umlaut mark */ {"[Verbar]", "||" }, /*ISOtech, dbl vertical bar */ - /*{"[Xi ]", " " }, /*ISOgrk3, Greek, large xi */ - /*{"[Yacute]", " " }, /*ISOlat1, capital Y,acute accent*/ + /*{"[Xi ]", " " }, *ISOgrk3, Greek, large xi */ + /*{"[Yacute]", " " }, *ISOlat1, capital Y,acute accent*/ { NULL , " " }, /* default character to use */ }; diff --git a/cde/lib/DtHelp/XInterface.c b/cde/lib/DtHelp/XInterface.c index 8f6ce084..aff1a2b9 100644 --- a/cde/lib/DtHelp/XInterface.c +++ b/cde/lib/DtHelp/XInterface.c @@ -337,7 +337,7 @@ static SpecialSymbolTable SpcTable[] = {"[spades]", {'\252','\0'}, SymbolString}, /*ISOpub , spades suit symbol */ {"[sub ]", {'\314','\0'}, SymbolString}, /*ISOtech, subset/is implied by */ {"[sube ]", {'\315','\0'}, SymbolString}, /*ISOtech, subset, equals */ -/*"[sung ]", { ?? ,'\0'}, }, /*ISOnum , musical note(sung txt)*/ +/*"[sung ]", { ?? ,'\0'}, }, *ISOnum , musical note(sung txt)*/ {"[sup ]", {'\311','\0'}, SymbolString}, /*ISOtech, superset or implies */ {"[sup1 ]", {'\271','\0'}, IsoString }, /*ISOnum , superscript one */ {"[sup2 ]", {'\262','\0'}, IsoString }, /*ISOnum , superscript two */ diff --git a/cde/lib/DtSearch/raima/dio.c b/cde/lib/DtSearch/raima/dio.c index d0672883..3c36bf77 100644 --- a/cde/lib/DtSearch/raima/dio.c +++ b/cde/lib/DtSearch/raima/dio.c @@ -117,6 +117,7 @@ #include #include +#include #include "vista.h" #include "dbtype.h" #include "dbswab.h" diff --git a/cde/lib/DtSearch/raima/initial.c b/cde/lib/DtSearch/raima/initial.c index 463cc55d..fb246402 100644 --- a/cde/lib/DtSearch/raima/initial.c +++ b/cde/lib/DtSearch/raima/initial.c @@ -51,6 +51,7 @@ #include #include +#include #include "vista.h" #include "dbtype.h" #include "dbswab.h" diff --git a/cde/lib/DtSvc/DtCodelibs/Imakefile b/cde/lib/DtSvc/DtCodelibs/Imakefile index 5ce7fba1..f06b5d30 100644 --- a/cde/lib/DtSvc/DtCodelibs/Imakefile +++ b/cde/lib/DtSvc/DtCodelibs/Imakefile @@ -17,7 +17,7 @@ XCOMM (c) Copyright 1996 Hitachi. #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) #include diff --git a/cde/lib/DtSvc/DtEncap/pty.c b/cde/lib/DtSvc/DtEncap/pty.c index 5bc0a6e1..a754bdfd 100644 --- a/cde/lib/DtSvc/DtEncap/pty.c +++ b/cde/lib/DtSvc/DtEncap/pty.c @@ -61,10 +61,6 @@ #include #endif -#if defined(__cplusplus) -#include -#endif - #if defined(__apollo) && !defined(ONLCR) # define ONLCR 0 /* This guy (XPG3), not on apollo yet */ #endif diff --git a/cde/lib/DtSvc/DtUtil1/DbLoad.c b/cde/lib/DtSvc/DtUtil1/DbLoad.c index 6f8ce813..f7187348 100644 --- a/cde/lib/DtSvc/DtUtil1/DbLoad.c +++ b/cde/lib/DtSvc/DtUtil1/DbLoad.c @@ -53,11 +53,11 @@ #include #else -#if defined(sun) +#if defined(sun) || defined(CSRG_BASED) #include #else #include -#endif /* sun */ +#endif /* sun || CSRD_BASED */ #endif /* __hpux */ diff --git a/cde/lib/DtSvc/DtUtil1/DtsInit.c b/cde/lib/DtSvc/DtUtil1/DtsInit.c index aade879f..f28fe90f 100644 --- a/cde/lib/DtSvc/DtUtil1/DtsInit.c +++ b/cde/lib/DtSvc/DtUtil1/DtsInit.c @@ -51,11 +51,11 @@ #include #else -#if defined(sun) +#if defined(sun) || defined(CSRG_BASED) #include #else #include -#endif /* sun */ +#endif /* sun || CSRG_BASED */ #endif /* __hpux */ diff --git a/cde/lib/DtSvc/DtUtil2/DtosP.h b/cde/lib/DtSvc/DtUtil2/DtosP.h index 0d21a337..09b52656 100644 --- a/cde/lib/DtSvc/DtUtil2/DtosP.h +++ b/cde/lib/DtSvc/DtUtil2/DtosP.h @@ -150,6 +150,9 @@ static char SCCSID[] = "OSF/Motif: @(#)_DtosP.h 4.16 91/09/12"; # ifdef __GNUC__ +# ifdef alloca +# undef alloca +# endif # define alloca __builtin_alloca # define ALLOCATE_LOCAL(size) alloca((int)(size)) # define DEALLOCATE_LOCAL(ptr) /* as nothing */ diff --git a/cde/lib/DtSvc/DtUtil2/FileUtil.c b/cde/lib/DtSvc/DtUtil2/FileUtil.c index da24652d..d3e799cc 100644 --- a/cde/lib/DtSvc/DtUtil2/FileUtil.c +++ b/cde/lib/DtSvc/DtUtil2/FileUtil.c @@ -40,11 +40,11 @@ #ifdef __hpux #include /* opendir(), directory(3C) */ #else -#if defined(sun) +#if defined(sun) || defined(CSRG_BASED) #include /* opendir(), directory(3C) */ #else #include -#endif /* sun */ +#endif /* sun || CSRG_BASED */ #endif /* __hpux */ #include diff --git a/cde/lib/DtSvc/DtUtil2/Utility.c b/cde/lib/DtSvc/DtUtil2/Utility.c index 301e8fe3..af2db945 100644 --- a/cde/lib/DtSvc/DtUtil2/Utility.c +++ b/cde/lib/DtSvc/DtUtil2/Utility.c @@ -38,7 +38,7 @@ #ifdef __hpux #include #else -#if defined(sun) +#if defined(sun) || defined(CSRG_BASED) #include #else #include diff --git a/cde/lib/DtSvc/include/bms/usersig.h b/cde/lib/DtSvc/include/bms/usersig.h index 238cfed9..37190a96 100644 --- a/cde/lib/DtSvc/include/bms/usersig.h +++ b/cde/lib/DtSvc/include/bms/usersig.h @@ -33,7 +33,7 @@ */ #ifndef _usersig_h -#define _usesig_h +#define _usersig_h /* -------------------------------------------- */ /* Requires: */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c index 2ae8cedb..e59e3821 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c @@ -111,6 +111,12 @@ static char rcs_id[] = "$TOG: TermPrimSetPty.c /main/2 1998/04/03 17:11:24 mgree #define NXTTYMODES 16 #if defined(CSRG_BASED) +#ifdef TAB3 +#undef TAB3 +#endif +#ifdef TABDLY +#undef TABDLY +#endif #define TAB3 0x00000000 #define NLDLY 0x00000000 #define CRDLY 0x00000000 @@ -158,7 +164,7 @@ parseTtyModes ) { ttyMode *pMode; - int c, i; + int c; int modeCount = 0; /* diff --git a/cde/lib/tt/bin/shell/Imakefile b/cde/lib/tt/bin/shell/Imakefile index bc77714b..b0fe8100 100644 --- a/cde/lib/tt/bin/shell/Imakefile +++ b/cde/lib/tt/bin/shell/Imakefile @@ -1,7 +1,7 @@ XCOMM $XConsortium: Imakefile /main/10 1996/05/08 09:27:50 drk $ #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB) #include diff --git a/cde/lib/tt/lib/api/c/api_typecb_utils.h b/cde/lib/tt/lib/api/c/api_typecb_utils.h index 3d94cf28..387fe7f5 100644 --- a/cde/lib/tt/lib/api/c/api_typecb_utils.h +++ b/cde/lib/tt/lib/api/c/api_typecb_utils.h @@ -33,7 +33,7 @@ * * Utilities declarations for _Tt_typecb */ -#ifndef _API_TYPECB__UTILS_H +#ifndef _API_TYPECB_UTILS_H #define _API_TYPECB_UTILS_H #include "util/tt_object.h" #include "util/tt_list.h" diff --git a/cde/programs/dtappbuilder/src/abmf/obj_namesP.h b/cde/programs/dtappbuilder/src/abmf/obj_namesP.h index 9fa2b4db..c30af57c 100644 --- a/cde/programs/dtappbuilder/src/abmf/obj_namesP.h +++ b/cde/programs/dtappbuilder/src/abmf/obj_namesP.h @@ -43,7 +43,7 @@ /* * obj_namesP.h - C/Widget/other names for objects */ -#ifndef _ABMF_OBJ_NAMES__H_ +#ifndef _ABMF_OBJ_NAMESP_H_ #define _ABMF_OBJ_NAMESP_H_ #include "write_codeP.h" diff --git a/cde/programs/dtappbuilder/src/libABobj/obj_notifyP.h b/cde/programs/dtappbuilder/src/libABobj/obj_notifyP.h index 88da571f..bca7ccb2 100644 --- a/cde/programs/dtappbuilder/src/libABobj/obj_notifyP.h +++ b/cde/programs/dtappbuilder/src/libABobj/obj_notifyP.h @@ -45,7 +45,7 @@ * * Internal files - defines internal data structures, et cetera */ -#ifndef _ABOBJ_NOTIFYP_H +#ifndef _ABOBJ_NOTIFYP_H_ #define _ABOBJ_NOTIFYP_H_ #include "objP.h" /* include before obj.h! */ diff --git a/cde/programs/dtcm/libDtCmP/getdate.h b/cde/programs/dtcm/libDtCmP/getdate.h index d58b37e7..6d3289d8 100644 --- a/cde/programs/dtcm/libDtCmP/getdate.h +++ b/cde/programs/dtcm/libDtCmP/getdate.h @@ -52,7 +52,7 @@ #ifndef _GETDATE_H #define _GETDATE_H -#if defined(USG) || defined(__OpenBSD__) +#if defined(USG) || defined(CSRG_BASED) struct timeb { time_t time; diff --git a/cde/programs/dtcm/libDtCmP/util.c b/cde/programs/dtcm/libDtCmP/util.c index 33d72743..2ad7aaf3 100644 --- a/cde/programs/dtcm/libDtCmP/util.c +++ b/cde/programs/dtcm/libDtCmP/util.c @@ -61,6 +61,8 @@ #include /* SYS_NMLN */ #if defined(sun) #include +#elif defined(CSRG_BASED) +#include #else #include #endif /* sun */ diff --git a/cde/programs/dthelp/parser/canon1/util/entdef.h b/cde/programs/dthelp/parser/canon1/util/entdef.h index 46efc437..5a1d348a 100644 --- a/cde/programs/dthelp/parser/canon1/util/entdef.h +++ b/cde/programs/dthelp/parser/canon1/util/entdef.h @@ -30,6 +30,9 @@ #define M_ENDTAG 3 #define M_MD 4 #define M_MS 5 +#ifdef M_PI +#undef M_PI +#endif #define M_PI 6 #define M_CDATAENT 7 #define M_SDATA 8 diff --git a/cde/programs/dthelp/parser/pass1/util/entdef.h b/cde/programs/dthelp/parser/pass1/util/entdef.h index 005b00f5..3957c442 100644 --- a/cde/programs/dthelp/parser/pass1/util/entdef.h +++ b/cde/programs/dthelp/parser/pass1/util/entdef.h @@ -30,6 +30,9 @@ #define M_ENDTAG 3 #define M_MD 4 #define M_MS 5 +#ifdef M_PI +#undef M_PI +#endif #define M_PI 6 #define M_CDATAENT 7 #define M_SDATA 8 diff --git a/cde/programs/dthelp/parser/pass2/util/entdef.h b/cde/programs/dthelp/parser/pass2/util/entdef.h index cdc8a673..a7708525 100644 --- a/cde/programs/dthelp/parser/pass2/util/entdef.h +++ b/cde/programs/dthelp/parser/pass2/util/entdef.h @@ -30,6 +30,9 @@ #define M_ENDTAG 3 #define M_MD 4 #define M_MS 5 +#ifdef M_PI +#undef M_PI +#endif #define M_PI 6 #define M_CDATAENT 7 #define M_SDATA 8 diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/HardCopyFP.C b/cde/programs/dtinfo/DtMmdb/HardCopy/HardCopyFP.C index fa3f9ca5..79b61445 100644 --- a/cde/programs/dtinfo/DtMmdb/HardCopy/HardCopyFP.C +++ b/cde/programs/dtinfo/DtMmdb/HardCopy/HardCopyFP.C @@ -63,7 +63,7 @@ const char* loutFeatureProcessor::convertToLiteral(const char* str) if ( literalBufferSize < 2*size + 3 ) { literalBufferSize = 2*size + 3; literalBufferSize *= 2; - delete literalBuffer; + delete [] literalBuffer; literalBuffer = new char[literalBufferSize]; } diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C index 91d8af7e..79dc9c20 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C @@ -47,7 +47,7 @@ static ostrstream& terminate(ostrstream& ost) #endif DocParser::DocParser(Resolver &r) -: f_resolver(r), f_ignoring_element(0), +: f_ignoring_element(0), f_resolver(r), #if defined(SC3) f_buffer(new char[DATA_BUF_SIZ]), f_output(f_buffer, DATA_BUF_SIZ) diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.C index 848cbb78..1ddbbf3a 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.C +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.C @@ -22,6 +22,7 @@ */ // $TOG: defParser.C /main/5 1997/12/23 11:16:25 bill $ #ifndef lint +__attribute__((unused)) static const char defParsersccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90"; #endif #define defParserBYACC 1 diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C index f2fe08ec..6603fdf7 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C @@ -235,7 +235,7 @@ void addToDefTokenStringBuf(const unsigned char* str, int size) defToken_string_buf_size = 2*(size+defToken_string_buf_content_size); unsigned char* x = new unsigned char[defToken_string_buf_size]; memcpy(x, defToken_string_buf, defToken_string_buf_content_size); - delete defToken_string_buf; + delete [] defToken_string_buf; defToken_string_buf = x; } diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.l b/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.l index 0aa971d6..1d1f0d58 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.l +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.l @@ -51,7 +51,7 @@ void addToDefTokenStringBuf(const unsigned char* str, int size) defToken_string_buf_size = 2*(size+defToken_string_buf_content_size); unsigned char* x = new unsigned char[defToken_string_buf_size]; memcpy(x, defToken_string_buf, defToken_string_buf_content_size); - delete defToken_string_buf; + delete [] defToken_string_buf; defToken_string_buf = x; } diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/style.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/style.C index bf81fdbf..7c07c26d 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/style.C +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/style.C @@ -22,6 +22,7 @@ */ // $TOG: style.C /main/6 1998/04/17 11:51:49 mgreess $ #ifndef lint +__attribute__((unused)) static const char stylesccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90"; #endif #define styleBYACC 1 diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C index d2238a69..de648d31 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C @@ -263,7 +263,7 @@ void addToQstringBuf(const unsigned char* str, int size) qstring_buf_size = 2*(size+qstring_buf_content_size); unsigned char* x = new unsigned char[qstring_buf_size]; memcpy(x, qstring_buf, qstring_buf_content_size); - delete qstring_buf; + delete [] qstring_buf; qstring_buf = x; } @@ -699,7 +699,7 @@ case 2: # line 99 "tokenStyle.l" { if ( commentBufferSize < styleleng ) { - delete commentBuffer; + delete [] commentBuffer; commentBufferSize = 2 * styleleng ; commentBuffer = new char [commentBufferSize]; } diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.l b/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.l index 013cc190..49243c70 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.l +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.l @@ -77,7 +77,7 @@ void addToQstringBuf(const unsigned char* str, int size) qstring_buf_size = 2*(size+qstring_buf_content_size); unsigned char* x = new unsigned char[qstring_buf_size]; memcpy(x, qstring_buf, qstring_buf_content_size); - delete qstring_buf; + delete [] qstring_buf; qstring_buf = x; } @@ -98,7 +98,7 @@ unit ([Ii][Nn]|[Ii][Nn][Cc][Hh]|[Pp][Cc]|[Pp][Ii][Cc][Aa]|[Pp][Tt]|[Pp][Oo][Ii][ ^"#".* { if ( commentBufferSize < yyleng ) { - delete commentBuffer; + delete [] commentBuffer; commentBufferSize = 2 * yyleng ; commentBuffer = new char [commentBufferSize]; } diff --git a/cde/programs/dtinfo/DtMmdb/compression/code.C b/cde/programs/dtinfo/DtMmdb/compression/code.C index f5ea1ea9..f4272fa6 100644 --- a/cde/programs/dtinfo/DtMmdb/compression/code.C +++ b/cde/programs/dtinfo/DtMmdb/compression/code.C @@ -51,7 +51,7 @@ #include "compression/code.h" encoding_unit::encoding_unit(ostring* w, unsigned int f) : - word(w), freq(f), code(0), bits(0), leaf_htr_node(NULL) + word(w), bits(0), freq(f), code(0), leaf_htr_node(NULL) { } diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.C b/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.C index ba434bef..173ceeb5 100644 --- a/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.C +++ b/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.C @@ -40,7 +40,7 @@ char *Exception::g_next_avail = Exception::g_temp_space; // ///////////////////////////////////////////////////////////////// Exception::Exception() -: f_thrown(0), f_thrown_as_pointer(1), f_temporary(0), f_line(0), f_file(NULL), f_previous_exception(NULL) +: f_thrown(0), f_thrown_as_pointer(1), f_temporary(0), f_file(NULL), f_line(0), f_previous_exception(NULL) { PRINTF (("Constructed Exception obj @ %p\n", this)); } diff --git a/cde/programs/dtinfo/DtMmdb/object/oid_list.C b/cde/programs/dtinfo/DtMmdb/object/oid_list.C index c799d45f..a1e6e2d3 100644 --- a/cde/programs/dtinfo/DtMmdb/object/oid_list.C +++ b/cde/programs/dtinfo/DtMmdb/object/oid_list.C @@ -439,7 +439,7 @@ io_status oid_list::asciiIn(istream& in) list_ptr.p -> set(oid_array, v_sz); } - delete oid_array; + delete [] oid_array; return done; } diff --git a/cde/programs/dtinfo/DtMmdb/schema/sheet.C b/cde/programs/dtinfo/DtMmdb/schema/sheet.C index 2af92c43..c512d669 100644 --- a/cde/programs/dtinfo/DtMmdb/schema/sheet.C +++ b/cde/programs/dtinfo/DtMmdb/schema/sheet.C @@ -22,6 +22,7 @@ */ // $TOG: sheet.C /main/4 1997/12/23 11:20:35 bill $ #ifndef lint +__attribute__((unused)) static const char schemasccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90"; #endif #define schemaBYACC 1 diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh b/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh index 87054b3a..7c75f098 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh +++ b/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh @@ -57,9 +57,9 @@ public: BookmarkEdit (UAS_Pointer &mark) : f_mark_ptr (mark), f_shell (NULL), - f_modified (FALSE), f_name_text(NULL), f_notes_text(NULL), + f_modified (FALSE), f_wm_delete_callback(NULL) { MarkMgr::request ((UAS_Receiver *) this); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C index ba8d4331..ae539bae 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C @@ -118,15 +118,15 @@ GraphicAgent::GraphicAgent (UAS_Pointer &node_ptr, : f_shell (NULL), f_node_ptr(node_ptr), f_graphic (gr), - f_panner_state (PANNER_NONE), - f_current_scale (100), - f_scale_button(NULL), - f_setcustom(0), f_panner(NULL), f_pixmap_widget(NULL), + f_panner_state (PANNER_NONE), + f_current_scale (100), f_view_menu(NULL), f_message_area(NULL), - f_custom_scale(NULL) + f_scale_button(NULL), + f_custom_scale(NULL), + f_setcustom(0) { f_graphic->pixmap_graphic()->agent(this); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.hh b/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.hh index 880e02fb..c28cdc61 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.hh +++ b/cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.hh @@ -152,14 +152,13 @@ private: // variables inline LibraryAgent::LibraryAgent() : f_shell (NULL), + f_doc_tree_view(), f_oe (NULL), f_keep_forever (FALSE), f_wm_delete_callback (NULL), f_tracking_hierarchy (NULL), f_popped_down (TRUE), f_close (NULL), - f_close_sensitive (FALSE), - f_doc_tree_view(), f_copy(NULL), f_detach(NULL), f_detach2(NULL), @@ -171,6 +170,7 @@ LibraryAgent::LibraryAgent() f_remove(NULL), f_remove2(NULL), f_auto_track(NULL), + f_close_sensitive (FALSE), f_status_text(NULL), f_scope_menu(NULL) diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/MapAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/MapAgentMotif.C index a1630caa..ba628713 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/MapAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/MapAgentMotif.C @@ -219,15 +219,15 @@ MapButton::destroy() // ///////////////////////////////////////////////////////////////// MapAgent::MapAgent() -: f_shell (NULL), - f_onscreen (FALSE), - f_locked(FALSE), +: f_locked(FALSE), f_map_mode(LOCAL_MODE), + f_shell (NULL), f_porthole(NULL), f_panner(NULL), f_tree(NULL), f_wm_delete_callback(NULL), f_lock(NULL), + f_onscreen (FALSE), f_min_tree_width(0), f_min_tree_height(0) { diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/MarkChooser.C b/cde/programs/dtinfo/dtinfo/src/Agents/MarkChooser.C index cb2d8fbc..53262b83 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/MarkChooser.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/MarkChooser.C @@ -84,8 +84,8 @@ MarkChooser::MarkChooser (Widget parent, xList &marks, const char *title_key, const char *ok_key) : f_selected_item (-1), - f_mark_list (&marks), - f_done(FALSE) + f_done(FALSE), + f_mark_list (&marks) { create_ui (parent, title_key, ok_key); update_list(); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.C b/cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.C index 5d29d8ce..acd2a75a 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.C @@ -81,9 +81,9 @@ // ///////////////////////////////////////////////////////////////// MarkListView::MarkListView() -: f_shell (NULL), - f_popped_up (FALSE), - f_selected_item(0) +: f_selected_item(0), + f_shell (NULL), + f_popped_up (FALSE) { } diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.hh b/cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.hh index 4fe7ebb3..a59d6781 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.hh +++ b/cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.hh @@ -94,8 +94,8 @@ private: // variables inline MessageAgent::MessageAgent() : f_dialog (NULL), - f_exit_flag (False), f_text(NULL), + f_exit_flag (False), f_real_parent(NULL), f_popped_up(FALSE), f_pressed_ok(FALSE) diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C index ead30806..1792a678 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C @@ -778,16 +778,6 @@ NodeWindowAgent::NodeWindowAgent (u_int serial_no) f_shell (NULL), f_help_dsp_area (NULL), f_close(NULL), - f_current_ancestor (NULL), - f_form(NULL), - f_preview_timeout (NULL), - f_serial_number(serial_no), - f_history_display (FALSE), - f_vscrollbar_offset(0), - f_hscrollbar_offset(0), - f_graphic_segment(NULL), - f_graphics_handler(NULL), - f_close_sensitive(FALSE), f_frame(NULL), f_create_bmrk(NULL), f_create_anno(NULL), @@ -810,10 +800,20 @@ NodeWindowAgent::NodeWindowAgent (u_int serial_no) f_print(NULL), f_print2(NULL), f_print_as(NULL), + f_current_ancestor (NULL), + f_form(NULL), f_move_mark_sensitive(0), f_last_access_time(0), f_locked(FALSE), - f_wm_delete_callback(NULL) + f_wm_delete_callback(NULL), + f_preview_timeout (NULL), + f_serial_number(serial_no), + f_history_display (FALSE), + f_vscrollbar_offset(0), + f_hscrollbar_offset(0), + f_graphic_segment(NULL), + f_graphics_handler(NULL), + f_close_sensitive(FALSE) { UAS_Common::request ((UAS_Receiver *) this); diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C index 41c76305..84282d48 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C @@ -151,9 +151,8 @@ static Boolean print_hierarchy; // keep track of hierarchy vs section #if 0 && defined(PRINTING_SUPPORTED) static void PrintEverything(AppPrintData *p); -#endif /* PRINTING_SUPPORTED */ - static void PrintOneUASCommon(UAS_Pointer &doc, Widget pshell, int *cur_pageP); +#endif /* PRINTING_SUPPORTED */ PrintPanelAgent::PrintPanelAgent() { @@ -963,7 +962,6 @@ PrintEverything(AppPrintData *p) RCS_DEBUG("PrintEverything exiting.\n"); } -#endif /* PRINTING_SUPPORTED */ static void PrintOneUASCommon(UAS_Pointer &doc, Widget pshell, int *cur_pageP) @@ -1030,6 +1028,7 @@ PrintOneUASCommon(UAS_Pointer &doc, Widget pshell, int *cur_pageP) } } } +#endif /* PRINTING_SUPPORTED */ /* * ------------------------------------------------------------------------ diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.hh b/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.hh index 83048d27..0b342053 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.hh +++ b/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.hh @@ -115,9 +115,9 @@ protected: // variables inline SearchResultsAgent::SearchResultsAgent() -: f_work_proc_id (0), f_popped_up(FALSE), f_my_ale(NULL), f_retain(FALSE), - f_results(NULL), f_selected_item(0), f_retain_toggle(NULL), f_query_text(NULL), - f_hits_label(NULL), f_scope_label(NULL), f_docs_to_display(0), f_count(0), - f_scale(0), f_header_indent(0) +: f_my_ale(NULL), f_retain(FALSE), f_results(NULL), f_selected_item(0), + f_retain_toggle(NULL), f_query_text(NULL), f_hits_label(NULL), + f_scope_label(NULL), f_docs_to_display(0), f_count(0), f_scale(0), + f_work_proc_id(0), f_popped_up(FALSE), f_header_indent(0) { } diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/Buffer.hh b/cde/programs/dtinfo/dtinfo/src/Basic/Buffer.hh index 9068cf02..6d68a331 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/Buffer.hh +++ b/cde/programs/dtinfo/dtinfo/src/Basic/Buffer.hh @@ -75,8 +75,8 @@ public: void write (const int integer); - void write (const size_t integer) - { write ((size_t) ((void *) integer)); } + void write (const unsigned int integer) + { write ((int) (integer)); } void write (const char *string); void write (const char *bytes, u_int size, u_int length); diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/List.C b/cde/programs/dtinfo/dtinfo/src/Basic/List.C index ae2e8fe8..7f4c1d59 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/List.C +++ b/cde/programs/dtinfo/dtinfo/src/Basic/List.C @@ -121,8 +121,6 @@ List::append (FolioObject &element) check_space(); /* -------- Add the element. -------- */ - if (&element == NULL) - abort(); f_list_element[f_length] = &element; f_length++; notify (APPENDED, (void *)(size_t) (f_length - 1)); diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C b/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C index 1dc1f9e8..c183673c 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C @@ -429,7 +429,7 @@ olias_send_event (Widget, OliasEvent *event) if (locator == NULL) return (OLIAS_TIMEOUT); ON_DEBUG(printf(">>> g_top_locator = %p\n", g_top_locator)); - if (g_top_locator == NULL) + if (g_top_locator[0] == '\0') return (OLIAS_TIMEOUT); g_scroll_to_locator = TRUE; len = MIN(strlen(locator), 4096 - 1); diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C b/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C index b4127d56..82209b2c 100644 --- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C +++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C @@ -231,16 +231,16 @@ print_justify (unsigned value) CanvasRenderer::CanvasRenderer(int font_scale) : Renderer(), + f_vcc(0), + f_current_container(NULL), + f_current_displayable(NULL), f_current_tgroup (0), f_font (0), f_link_idx (-1), f_font_scale(font_scale), + f_default_features(NULL), fBogusSymbol(gElemSymTab->intern("%BOGUS")), - f_level(0), - f_vcc(0), - f_current_container(NULL), - f_current_displayable(NULL), - f_default_features(NULL) + f_level(0) { // make symbols for ( int i=0; i < REND_SYMBOLS; i++) @@ -2534,7 +2534,7 @@ TGDefn::build() delete grid[r] ; // clean up column memory } - delete grid ; + delete [] grid ; // now apply the formats to the _DtCvTable { diff --git a/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C b/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C index ad5acc24..7ebbc8d0 100644 --- a/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C @@ -226,8 +226,8 @@ public: Shell_Info (Widget w) : f_shell (w), f_size_hints (NULL), - f_restore (False), f_has_size_hints(False), + f_restore (False), f_iconic(False), f_has_wm_state(False) { } @@ -247,22 +247,22 @@ public: // ///////////////////////////////////////////////////////////////// WindowSystem::WindowSystem (int &argc, char *argv[]) -: f_printing(False), +: f_print_display(NULL), + f_printing(False), f_default_pixmap (0), + f_default_print_pixmap(0), f_defpix_width (0), f_defpix_height (0), - f_detached_pixmap(0), - f_shell_list (20), - f_cursor_stack_pos(-1), - f_dtinfo_font(NULL), - f_dtinfo_space_font(NULL), - f_print_display(NULL), - f_default_print_pixmap(0), f_print_defpix_width(0), f_print_defpix_height(0), + f_detached_pixmap(0), f_detached_width(0), f_detached_height(0), - f_print_screen(NULL) + f_shell_list (20), + f_cursor_stack_pos(-1), + f_print_screen(NULL), + f_dtinfo_font(NULL), + f_dtinfo_space_font(NULL) { f_argc = &argc; f_argv = argv; diff --git a/cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C b/cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C index 5a237a59..c19f9d5f 100644 --- a/cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C +++ b/cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C @@ -105,8 +105,8 @@ QueryEditor::QueryEditor(UAS_SearchEngine& search_engine) : f_query (NULL), f_query_view (NULL), f_shell (NULL), - f_null_terms (0), - f_min_term_width(0) + f_min_term_width(0), + f_null_terms (0) { f_query_editor = this; diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C index 3da61459..749b0315 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C @@ -60,12 +60,14 @@ using namespace std; #include "dbug.h" /* ala Fred Fish's dbug package from uunet */ #endif +#ifdef LICENSE_MANAGEMENT const int A_FEATURE = OLAF::Feature; const int A_VEN_CODE = OLAF::VenCode; const int A_VERSION = OLAF::Version; const int A_GROUPING = OLAF::Grouping; const int A_DEMO_TERMS = OLAF::DemoTerms; const int A_DEFAULT_SECTION = OLAF::DefaultSection; +#endif /*********************************** * diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.C index b3dbf2c2..8ec441d3 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.C +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.C @@ -22,6 +22,7 @@ */ /* $TOG: OL_DataExpr.C /main/4 1997/12/23 11:38:27 bill $ */ #ifndef lint +__attribute__((unused)) static const char ol_datasccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90"; #endif #define ol_dataBYACC 1 diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c b/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c index ae1e222a..f3218647 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c @@ -37,7 +37,7 @@ #include #include #include -# include /* for dirname() */ +#include /* for dirname() */ #include #include #if !defined(CSRG_BASED) @@ -235,7 +235,7 @@ static char *buildSpec(void); static void defaultGlobals(void); static void checkGlobals(void); static int parseArgs(int argc, char *argv[]); -static char *parseDocument(Boolean runCmd, ...); +static char *parseDocument(int runCmd, ...); static void buildBookcase(char *cmdSrc, char *dirName); static char *storeBookCase(char *cmdSrc, char *tocOpt, char *dbName, char *dirName); @@ -1355,7 +1355,7 @@ parseArgs(int argc, char *argv[]) } static char * -parseDocument(Boolean runCmd, ...) +parseDocument(int runCmd, ...) { va_list ap; char *ptr; diff --git a/cde/programs/dtlogin/vgmain.c b/cde/programs/dtlogin/vgmain.c index a39b32a9..ae9b811c 100644 --- a/cde/programs/dtlogin/vgmain.c +++ b/cde/programs/dtlogin/vgmain.c @@ -2222,7 +2222,6 @@ DebugWidgetResources(Widget w) XtGetValues(w, argt, i); } -/* /*************************************************************************** * * GetDisplayName (void) - transform the display name into a "short" diff --git a/cde/programs/dtprintinfo/Imakefile b/cde/programs/dtprintinfo/Imakefile index 3e781298..382ac172 100644 --- a/cde/programs/dtprintinfo/Imakefile +++ b/cde/programs/dtprintinfo/Imakefile @@ -1,7 +1,7 @@ XCOMM $TOG: Imakefile /main/21 1998/08/25 12:58:41 mgreess $ #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB) #define IHaveSubdirs diff --git a/cde/programs/dtprintinfo/UI/Imakefile b/cde/programs/dtprintinfo/UI/Imakefile index 44fc8028..1fca1549 100644 --- a/cde/programs/dtprintinfo/UI/Imakefile +++ b/cde/programs/dtprintinfo/UI/Imakefile @@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/04/21 19:50:41 drk $ #define LibInstall NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) INCLUDES = -I. -I.. -I../libUI -I../libUI/MotifUI -I../objects -I../util -I../objects -I../objects/PrintObj diff --git a/cde/programs/dtprintinfo/libUI/Imakefile b/cde/programs/dtprintinfo/libUI/Imakefile index 9891a4ee..b2e04f30 100644 --- a/cde/programs/dtprintinfo/libUI/Imakefile +++ b/cde/programs/dtprintinfo/libUI/Imakefile @@ -1,7 +1,7 @@ XCOMM $TOG: Imakefile /main/14 1998/08/25 12:59:12 mgreess $ #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB) #define IHaveSubdirs diff --git a/cde/programs/dtprintinfo/objects/PrintObj/Imakefile b/cde/programs/dtprintinfo/objects/PrintObj/Imakefile index 76d46a88..1430c5ce 100644 --- a/cde/programs/dtprintinfo/objects/PrintObj/Imakefile +++ b/cde/programs/dtprintinfo/objects/PrintObj/Imakefile @@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:52:17 drk $ #define LibInstall NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) INCLUDES = -I. -I.. -I../.. -I../../util diff --git a/cde/programs/dtprintinfo/util/Imakefile b/cde/programs/dtprintinfo/util/Imakefile index 6b144446..bcdf14f8 100644 --- a/cde/programs/dtprintinfo/util/Imakefile +++ b/cde/programs/dtprintinfo/util/Imakefile @@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:50:47 drk $ #define LibInstall NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) INCLUDES = -I. diff --git a/cde/programs/dtsearchpath/dtsp/InfoLibSearchPath.C b/cde/programs/dtsearchpath/dtsp/InfoLibSearchPath.C index 4deff87d..03653300 100644 --- a/cde/programs/dtsearchpath/dtsp/InfoLibSearchPath.C +++ b/cde/programs/dtsearchpath/dtsp/InfoLibSearchPath.C @@ -20,7 +20,7 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -/* $TOG: InfoLibSearchPath.C /main/5 1998/08/17 10:33:55 mgreess $ +/* $TOG: InfoLibSearchPath.C /main/5 1998/08/17 10:33:55 mgreess $ */ /* * (c) Copyright 1996 Digital Equipment Corporation. * (c) Copyright 1996 Hewlett-Packard Company. diff --git a/cde/programs/dtstyle/ColorFile.c b/cde/programs/dtstyle/ColorFile.c index dcbeeab2..0fbe6110 100644 --- a/cde/programs/dtstyle/ColorFile.c +++ b/cde/programs/dtstyle/ColorFile.c @@ -50,7 +50,7 @@ #ifdef __hpux #include /* opendir(), directory(3C) */ #else -#if SVR4 || sco +#if defined(SVR4) || defined(sco) || defined(CSRG_BASED) #include /* opendir(), directory(3C) */ #else #include diff --git a/cde/programs/dtudcfonted/libfal/include/os.h b/cde/programs/dtudcfonted/libfal/include/os.h index aeb33e6b..bf5a7c2e 100644 --- a/cde/programs/dtudcfonted/libfal/include/os.h +++ b/cde/programs/dtudcfonted/libfal/include/os.h @@ -99,6 +99,9 @@ pragma on(alloca); #if defined(__GNUC__) #if !defined(__linux__) +#ifdef alloca +#undef alloca +#endif #define alloca ___builtin_alloca #endif #define ALLOCATE_LOCAL(size) alloca((int)(size)) diff --git a/cde/programs/ttsnoop/Imakefile b/cde/programs/ttsnoop/Imakefile index 3bde4cef..7d865f61 100644 --- a/cde/programs/ttsnoop/Imakefile +++ b/cde/programs/ttsnoop/Imakefile @@ -5,7 +5,7 @@ UTILLIB = -lutil #endif /* BSDArchitecture */ #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) INCLUDES = $(TIRPCINC) EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)