external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Fix warnings on FreeBSD

Browse source
This commit is contained in:
Ulrich Wilkens 2018-06-01 03:55:10 +02:00 • committed by Jon Trulson
parent 885b65a09a
commit 297b6bd845
65 changed files with 342 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cde/config/cf/FreeBSD.cf
View file

@ -117,6 +117,7 @@ USE_GCC = UseGcc
#define HasMakefileSafeInclude YES #define HasMakefileSafeInclude YES
#define IncludeMakefile(file) HASH_SIGN dependencies are in .depend #define IncludeMakefile(file) HASH_SIGN dependencies are in .depend
#define DependFileName .depend #define DependFileName .depend
#define DependDefines -D__cplusplus
#if OSMajorVersion < 3 #if OSMajorVersion < 3
#if OSMinorVersion < 2 #if OSMinorVersion < 2
#ifndef ExtraLibraries #ifndef ExtraLibraries

55
cde/config/makedepend/ifparser.c
View file

@ -81,6 +81,7 @@
#include "ifparser.h" #include "ifparser.h"
#include <ctype.h> #include <ctype.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
@ -201,7 +202,7 @@ parse_value (g, cp, valp)
const char *cp; const char *cp;
long *valp; long *valp;
{ {
const char *var; const char *var, *varend;
*valp = 0; *valp = 0;
@ -228,6 +229,16 @@ parse_value (g, cp, valp)
*valp = -(*valp); *valp = -(*valp);
return cp; 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 '#': case '#':
DO (cp = parse_variable (g, cp + 1, &var)); DO (cp = parse_variable (g, cp + 1, &var));
SKIPSPACE (cp); SKIPSPACE (cp);
@ -276,7 +287,24 @@ parse_value (g, cp, valp)
return CALLFUNC(g, handle_error) (g, cp, "variable or number"); return CALLFUNC(g, handle_error) (g, cp, "variable or number");
else { else {
DO (cp = parse_variable (g, cp, &var)); 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; return cp;
@ -464,7 +492,7 @@ parse_band (g, cp, valp)
static const char * static const char *
parse_bor (g, cp, valp) parse_bxor (g, cp, valp)
IfParser *g; IfParser *g;
const char *cp; const char *cp;
long *valp; long *valp;
@ -474,6 +502,27 @@ parse_bor (g, cp, valp)
DO (cp = parse_band (g, cp, valp)); DO (cp = parse_band (g, cp, valp));
SKIPSPACE (cp); 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) { switch (*cp) {
case '|': case '|':
if (cp[1] != '|') { if (cp[1] != '|') {

330
cde/lib/DtHelp/AsciiSpc.c
View file

@ -75,61 +75,61 @@ static SpecialSymbolTable SpcTable[] =
* The last entry will catch them and map them to a blank * The last entry will catch them and map them to a blank
* anyway. This will shorten the table by quite a bit. * anyway. This will shorten the table by quite a bit.
*/ */
/*{"[aacute]", " " }, /*ISOlat1, small a, acute accent */ /*{"[aacute]", " " }, *ISOlat1, small a, acute accent */
/*{"[acirc ]", " " }, /*ISOlat1, small a, circumflex */ /*{"[acirc ]", " " }, *ISOlat1, small a, circumflex */
/*{"[aelig ]", " " }, /*ISOlat1, small ae diphthong */ /*{"[aelig ]", " " }, *ISOlat1, small ae diphthong */
/*{"[agrave]", " " }, /*ISOlat1, small a, grave accent */ /*{"[agrave]", " " }, *ISOlat1, small a, grave accent */
/*{"[alpha ]", " " }, /*ISOgrk3, Greek, small alpha */ /*{"[alpha ]", " " }, *ISOgrk3, Greek, small alpha */
/*{"[aleph ]", " " }, /*ISOtech, aleph, Hebrews */ /*{"[aleph ]", " " }, *ISOtech, aleph, Hebrews */
{"[amp ]", "&" }, /*ISOnum , ampersand */ {"[amp ]", "&" }, /*ISOnum , ampersand */
{"[and ]", "^" }, /*ISOtech, wedge, logical and */ {"[and ]", "^" }, /*ISOtech, wedge, logical and */
/*{"[ang ]", " " }, /*ISOamso, angle */ /*{"[ang ]", " " }, *ISOamso, angle */
/*{"[angst ]", " " }, /*ISOtech, Angstrom, cap A, ring */ /*{"[angst ]", " " }, *ISOtech, Angstrom, cap A, ring */
{"[ap ]", "~=" }, /*ISOtech, approximately equal */ {"[ap ]", "~=" }, /*ISOtech, approximately equal */
{"[apos ]", "'" }, /*ISOnum , apostrophe */ {"[apos ]", "'" }, /*ISOnum , apostrophe */
/*{"[aring ]", " " }, /*ISOlat1, small a, ring */ /*{"[aring ]", " " }, *ISOlat1, small a, ring */
{"[ast ]", "*" }, /*ISOnum , asterisk */ {"[ast ]", "*" }, /*ISOnum , asterisk */
/*{"[atilde]", " " }, /*ISOlat1, small a, tilde */ /*{"[atilde]", " " }, *ISOlat1, small a, tilde */
/*{"[auml ]", " " }, /*ISOlat1, small a, umlaut mark */ /*{"[auml ]", " " }, *ISOlat1, small a, umlaut mark */
/*{"[beta ]", " " }, /*ISOgrk3, Greek, small beta */ /*{"[beta ]", " " }, *ISOgrk3, Greek, small beta */
/*{"[blank ]", " " }, /*ISOpub , significant blank */ /*{"[blank ]", " " }, *ISOpub , significant blank */
/*{"[bottom]", " " }, /*ISOtech, bottom symbol */ /*{"[bottom]", " " }, *ISOtech, bottom symbol */
{"[bsol ]", "\\" }, /*ISOnum , backslash, rev solidus*/ {"[bsol ]", "\\" }, /*ISOnum , backslash, rev solidus*/
{"[bull ]", "*" }, /*ISOpub , round bullet,filled */ {"[bull ]", "*" }, /*ISOpub , round bullet,filled */
/*{"[brvbar]", "|" }, /*ISOnum , broken vertical bar */ /*{"[brvbar]", "|" }, *ISOnum , broken vertical bar */
/*{"[cap ]", " " }, /*ISOtech, intersection */ /*{"[cap ]", " " }, *ISOtech, intersection */
/*{"[ccedil]", " " }, /*ISOlat1, small c, cedilla */ /*{"[ccedil]", " " }, *ISOlat1, small c, cedilla */
/*{"[cent ]", " " }, /*ISOnum , cent sign */ /*{"[cent ]", " " }, *ISOnum , cent sign */
/*{"[chi ]", " " }, /*ISOgrk3, Greek, small chi */ /*{"[chi ]", " " }, *ISOgrk3, Greek, small chi */
/*{"[clubs ]", " " }, /*ISOpub , clubs suit symbol */ /*{"[clubs ]", " " }, *ISOpub , clubs suit symbol */
{"[colon ]", ":" }, /*ISOnum , colon */ {"[colon ]", ":" }, /*ISOnum , colon */
{"[comma ]", "," }, /*ISOnum , comma */ {"[comma ]", "," }, /*ISOnum , comma */
{"[commat]", "@" }, /*ISOnum , commercial at */ {"[commat]", "@" }, /*ISOnum , commercial at */
/*{"[cong ]", " " }, /*ISOtech, congruent with */ /*{"[cong ]", " " }, *ISOtech, congruent with */
/*{"[copy ]", " " }, /*ISOnum , copyright symbol */ /*{"[copy ]", " " }, *ISOnum , copyright symbol */
{"[cup ]", "U" }, /*ISOtech, union or logical sum */ {"[cup ]", "U" }, /*ISOtech, union or logical sum */
/*{"[curren]", " " }, /*ISOnum , general currency sign */ /*{"[curren]", " " }, *ISOnum , general currency sign */
/*{"[darr ]", " " }, /*ISOnum , downward arrow */ /*{"[darr ]", " " }, *ISOnum , downward arrow */
/*{"[dArr ]", " " }, /*ISOamsa, down double arrow */ /*{"[dArr ]", " " }, *ISOamsa, down double arrow */
{"[dash ]", "-" }, /*ISOpub , dash */ {"[dash ]", "-" }, /*ISOpub , dash */
/*{"[deg ]", " " }, /*ISOnum , degree sign */ /*{"[deg ]", " " }, *ISOnum , degree sign */
/*{"[delta ]", " " }, /*ISOgrk3, Greek, small delta */ /*{"[delta ]", " " }, *ISOgrk3, Greek, small delta */
/*{"[diams ]", " " }, /*ISOpub , diamond suit symbol */ /*{"[diams ]", " " }, *ISOpub , diamond suit symbol */
{"[divide]", "/" }, /*ISOnum , divide sign */ {"[divide]", "/" }, /*ISOnum , divide sign */
{"[dollar]", "$" }, /*ISOnum , dollar sign */ {"[dollar]", "$" }, /*ISOnum , dollar sign */
/*{"[eacute]", " " }, /*ISOlat1, small e, acute accent */ /*{"[eacute]", " " }, *ISOlat1, small e, acute accent */
/*{"[ecirc ]", " " }, /*ISOlat1, small e, circumflex */ /*{"[ecirc ]", " " }, *ISOlat1, small e, circumflex */
/*{"[egrave]", " " }, /*ISOlat1, small e, grave accent */ /*{"[egrave]", " " }, *ISOlat1, small e, grave accent */
/*{"[empty ]", " " }, /*ISOamso, empty string, o/slash */ /*{"[empty ]", " " }, *ISOamso, empty string, o/slash */
/*{"[epsiv ]", " " }, /*ISOgrk3, Greek,sm epsilon, var */ /*{"[epsiv ]", " " }, *ISOgrk3, Greek,sm epsilon, var */
{"[equals]", "=" }, /*ISOnum , equals sign */ {"[equals]", "=" }, /*ISOnum , equals sign */
/*{"[equiv ]", " " }, /*ISOtech, identical with */ /*{"[equiv ]", " " }, *ISOtech, identical with */
/*{"[eta ]", " " }, /*ISOgrk3, Greek, small eta */ /*{"[eta ]", " " }, *ISOgrk3, Greek, small eta */
/*{"[eth ]", " " }, /*ISOlat1, small eth, Icelandic */ /*{"[eth ]", " " }, *ISOlat1, small eth, Icelandic */
/*{"[euml ]", " " }, /*ISOlat1, small e, umlaut mark */ /*{"[euml ]", " " }, *ISOlat1, small e, umlaut mark */
{"[excl ]", "!" }, /*ISOnum , exclamation mark */ {"[excl ]", "!" }, /*ISOnum , exclamation mark */
/*{"[exist ]", " " }, /*ISOtech, at least one exists */ /*{"[exist ]", " " }, *ISOtech, at least one exists */
/*{"[forall]", " " }, /*ISOtech, for all */ /*{"[forall]", " " }, *ISOtech, for all */
{"[frac12]", "1/2" }, /*ISOnum , fraction one-half */ {"[frac12]", "1/2" }, /*ISOnum , fraction one-half */
{"[frac13]", "1/3" }, /*ISOnum , fraction one-third */ {"[frac13]", "1/3" }, /*ISOnum , fraction one-third */
{"[frac14]", "1/4" }, /*ISOnum , fraction one-quarter */ {"[frac14]", "1/4" }, /*ISOnum , fraction one-quarter */
@ -145,30 +145,30 @@ static SpecialSymbolTable SpcTable[] =
{"[frac56]", "5/6" }, /*ISOnum , fraction five-sixths */ {"[frac56]", "5/6" }, /*ISOnum , fraction five-sixths */
{"[frac58]", "5/8" }, /*ISOnum , fraction five-eights */ {"[frac58]", "5/8" }, /*ISOnum , fraction five-eights */
{"[frac78]", "7/8" }, /*ISOnum , fraction seven-eights */ {"[frac78]", "7/8" }, /*ISOnum , fraction seven-eights */
/*{"[gamma ]", " " }, /*ISOgrk3, Greek, small gamma */ /*{"[gamma ]", " " }, *ISOgrk3, Greek, small gamma */
{"[ge ]", ">=" }, /*ISOtech, greater-than-or-equal */ {"[ge ]", ">=" }, /*ISOtech, greater-than-or-equal */
{"[gt ]", ">" }, /*ISOnum , greater than sign */ {"[gt ]", ">" }, /*ISOnum , greater than sign */
{"[half ]", "1/2" }, /*ISOnum , fraction one-half */ {"[half ]", "1/2" }, /*ISOnum , fraction one-half */
{"[harr ]", "<-->" }, /*ISOamsa, left & right arrow */ {"[harr ]", "<-->" }, /*ISOamsa, left & right arrow */
{"[hArr ]", "<<==>>" }, /*ISOamsa, l & r double arrow */ {"[hArr ]", "<<==>>" }, /*ISOamsa, l & r double arrow */
/*{"[hearts]", " " }, /*ISOpub , hearts suit symbol */ /*{"[hearts]", " " }, *ISOpub , hearts suit symbol */
{"[hellip]", "..." }, /*ISOpub , ellipsis(horizontal) */ {"[hellip]", "..." }, /*ISOpub , ellipsis(horizontal) */
{"[horbar]", "--" }, /*ISOnum , horizontal bar */ {"[horbar]", "--" }, /*ISOnum , horizontal bar */
{"[hyphen]", "-" }, /*ISOnum , hyphen */ {"[hyphen]", "-" }, /*ISOnum , hyphen */
/*{"[iacute]", " " }, /*ISOlat1, small i, acute accent */ /*{"[iacute]", " " }, *ISOlat1, small i, acute accent */
/*{"[icirc ]", " " }, /*ISOlat1, small i, circumflex */ /*{"[icirc ]", " " }, *ISOlat1, small i, circumflex */
/*{"[iexcl ]", " " }, /*ISOnum , inverted ! mark */ /*{"[iexcl ]", " " }, *ISOnum , inverted ! mark */
/*{"[igrave]", " " }, /*ISOlat1, small i, grave accent */ /*{"[igrave]", " " }, *ISOlat1, small i, grave accent */
/*{"[image ]", " " }, /*ISOamso,imaginary number symbol*/ /*{"[image ]", " " }, *ISOamso,imaginary number symbol*/
/*{"[infin ]", " " }, /*ISOtech, infinity */ /*{"[infin ]", " " }, *ISOtech, infinity */
/*{"[int ]", " " }, /*ISOtech, intergral operator */ /*{"[int ]", " " }, *ISOtech, intergral operator */
/*{"[iota ]", " " }, /*ISOgrk3, Greek, small iota */ /*{"[iota ]", " " }, *ISOgrk3, Greek, small iota */
/*{"[iquest]", " " }, /*ISOnum , inverted ? mark */ /*{"[iquest]", " " }, *ISOnum , inverted ? mark */
/*{"[isin ]", " " }, /*ISOtech, set membership */ /*{"[isin ]", " " }, *ISOtech, set membership */
/*{"[iuml ]", " " }, /*ISOlat1, small i, umlaut mark */ /*{"[iuml ]", " " }, *ISOlat1, small i, umlaut mark */
/*{"[kappa ]", " " }, /*ISOgrk3, Greek, small kappa */ /*{"[kappa ]", " " }, *ISOgrk3, Greek, small kappa */
/*{"[lambda]", " " }, /*ISOgrk3, Greek, small lambda */ /*{"[lambda]", " " }, *ISOgrk3, Greek, small lambda */
/*{"[lang ]", " " }, /*ISOtech, left angle bracket */ /*{"[lang ]", " " }, *ISOtech, left angle bracket */
{"[laquo ]", "<<" }, /*ISOnum , left angle quotation */ {"[laquo ]", "<<" }, /*ISOnum , left angle quotation */
{"[larr ]", "<--" }, /*ISOnum , leftward arrow */ {"[larr ]", "<--" }, /*ISOnum , leftward arrow */
{"[lArr ]", "<==" }, /*ISOtech, is implied by */ {"[lArr ]", "<==" }, /*ISOtech, is implied by */
@ -182,153 +182,153 @@ static SpecialSymbolTable SpcTable[] =
{"[lsquor]", "," }, /*ISOnum,rising single quote(low)*/ {"[lsquor]", "," }, /*ISOnum,rising single quote(low)*/
{"[lt ]", "<" }, /*ISOnum , less-than sign */ {"[lt ]", "<" }, /*ISOnum , less-than sign */
{"[mdash ]", "--" }, /*ISOpub , em dash(long dash) */ {"[mdash ]", "--" }, /*ISOpub , em dash(long dash) */
/*{"[micro ]", " " }, /*ISOnum , micro */ /*{"[micro ]", " " }, *ISOnum , micro */
/*{"[middot]", " " }, /*ISOnum , middle dot */ /*{"[middot]", " " }, *ISOnum , middle dot */
{"[minus ]", "-" }, /*ISOtech, minus sign */ {"[minus ]", "-" }, /*ISOtech, minus sign */
{"[mldr ]", "...." }, /*ISOpub , em leader */ {"[mldr ]", "...." }, /*ISOpub , em leader */
{"[mnplus]", "-/+" }, /*ISOtech, minus-or-plus sign */ {"[mnplus]", "-/+" }, /*ISOtech, minus-or-plus sign */
/*{"[mu ]", " " }, /*ISOgrk3, Greek, small mu */ /*{"[mu ]", " " }, *ISOgrk3, Greek, small mu */
/*{"[nabla ]", " " }, /*ISOtech, del, Hamilton operator*/ /*{"[nabla ]", " " }, *ISOtech, del, Hamilton operator*/
{"[nbsp ]", " " }, /*ISOnum , no break space */ {"[nbsp ]", " " }, /*ISOnum , no break space */
{"[ndash ]", "-" }, /*ISOpub , en dash(short dash) */ {"[ndash ]", "-" }, /*ISOpub , en dash(short dash) */
{"[ne ]", "!=" }, /*ISOtech, not equal */ {"[ne ]", "!=" }, /*ISOtech, not equal */
/*{"[ni ]", " " }, /*ISOtech, contains */ /*{"[ni ]", " " }, *ISOtech, contains */
{"[nldr ]", ".." }, /*ISOpub , double baseline dot */ {"[nldr ]", ".." }, /*ISOpub , double baseline dot */
/*{"[not ]", " " }, /*ISOnum , not */ /*{"[not ]", " " }, *ISOnum , not */
/*{"[notin ]", " " }, /*ISOtech, negated set membership*/ /*{"[notin ]", " " }, *ISOtech, negated set membership*/
/*{"[ntilde]", " " }, /*ISOlat1, small N, tilde */ /*{"[ntilde]", " " }, *ISOlat1, small N, tilde */
/*{"[nu ]", " " }, /*ISOgrk3, Greek, small nu */ /*{"[nu ]", " " }, *ISOgrk3, Greek, small nu */
{"[num ]", "#" }, /*ISOnum , number sign */ {"[num ]", "#" }, /*ISOnum , number sign */
/*{"[oacute]", " " }, /*ISOlat1, small o, acute accent */ /*{"[oacute]", " " }, *ISOlat1, small o, acute accent */
/*{"[ocirc ]", " " }, /*ISOlat1, small o, circumflex */ /*{"[ocirc ]", " " }, *ISOlat1, small o, circumflex */
/*{"[ograve]", " " }, /*ISOlat1, small o, grave accent */ /*{"[ograve]", " " }, *ISOlat1, small o, grave accent */
/*{"[ohm ]", " " }, /*ISOnum , ohm */ /*{"[ohm ]", " " }, *ISOnum , ohm */
/*{"[omega ]", " " }, /*ISOgrk3, Greek, small omega */ /*{"[omega ]", " " }, *ISOgrk3, Greek, small omega */
/*{"[oplus ]", " " }, /*ISOamsb, plus sign in circle */ /*{"[oplus ]", " " }, *ISOamsb, plus sign in circle */
{"[or ]", "V" }, /*ISOtech, vee, logical or */ {"[or ]", "V" }, /*ISOtech, vee, logical or */
/*{"[ordf ]", " " }, /*ISOnum , ordinal indicator, fem*/ /*{"[ordf ]", " " }, *ISOnum , ordinal indicator, fem*/
/*{"[ordm ]", " " }, /*ISOnum , ordinal indicator,male*/ /*{"[ordm ]", " " }, *ISOnum , ordinal indicator,male*/
/*{"[oslash]", " " }, /*ISOlat1, small o, slash */ /*{"[oslash]", " " }, *ISOlat1, small o, slash */
/*{"[osol ]", " " }, /*ISOamsb, slash in circle */ /*{"[osol ]", " " }, *ISOamsb, slash in circle */
/*{"[otilde]", " " }, /*ISOlat1, small o, tilde */ /*{"[otilde]", " " }, *ISOlat1, small o, tilde */
/*{"[otimes]", " " }, /*ISOamsb,multiply sign in circle*/ /*{"[otimes]", " " }, *ISOamsb,multiply sign in circle*/
/*{"[ouml ]", " " }, /*ISOlat1, small o, umlaut mark */ /*{"[ouml ]", " " }, *ISOlat1, small o, umlaut mark */
/*{"[over ]", " " }, /*made up, over symbol */ /*{"[over ]", " " }, *made up, over symbol */
{"[par ]", "||" }, /*ISOtech, parallel */ {"[par ]", "||" }, /*ISOtech, parallel */
/*{"[para ]", " " }, /*ISOnum , paragraph sign */ /*{"[para ]", " " }, *ISOnum , paragraph sign */
/*{"[part ]", " " }, /*ISOtech, partial differential */ /*{"[part ]", " " }, *ISOtech, partial differential */
{"[percnt]", "%" }, /*ISOnum , percent sign */ {"[percnt]", "%" }, /*ISOnum , percent sign */
{"[period]", "." }, /*ISOnum , full stop, period */ {"[period]", "." }, /*ISOnum , full stop, period */
/*{"[perp ]", " " }, /*ISOtech, perpendicular */ /*{"[perp ]", " " }, *ISOtech, perpendicular */
/*{"[phis ]", " " }, /*ISOgrk3, Greek, small phi */ /*{"[phis ]", " " }, *ISOgrk3, Greek, small phi */
/*{"[pi ]", " " }, /*ISOgrk3, Greek, small pi */ /*{"[pi ]", " " }, *ISOgrk3, Greek, small pi */
/*{"[piv ]", " " }, /*ISOgrk3, Greek, small pi, var */ /*{"[piv ]", " " }, *ISOgrk3, Greek, small pi, var */
{"[plus ]", "+" }, /*ISOnum , plus sign */ {"[plus ]", "+" }, /*ISOnum , plus sign */
{"[plusmn]", "+/-" }, /*ISOnum , plus or minus sign */ {"[plusmn]", "+/-" }, /*ISOnum , plus or minus sign */
{"[pound ]", "#" }, /*ISOnum , pound sign */ {"[pound ]", "#" }, /*ISOnum , pound sign */
{"[prime ]", "\'" }, /*ISOtech, prime or minute */ {"[prime ]", "\'" }, /*ISOtech, prime or minute */
/*{"[prop ]", " " }, /*ISOtech, proportional to */ /*{"[prop ]", " " }, *ISOtech, proportional to */
/*{"[psi ]", " " }, /*ISOgrk3, Greek, small psi */ /*{"[psi ]", " " }, *ISOgrk3, Greek, small psi */
{"[quest ]", "?" }, /*ISOnum , question mark */ {"[quest ]", "?" }, /*ISOnum , question mark */
{"[quot ]", "'" }, /*ISOnum , quote mark */ {"[quot ]", "'" }, /*ISOnum , quote mark */
/*{"[radic ]", " " }, /*ISOtech, radical */ /*{"[radic ]", " " }, *ISOtech, radical */
/*{"[rang ]", " " }, /*ISOtech, right angle bracket */ /*{"[rang ]", " " }, *ISOtech, right angle bracket */
{"[raquo ]", ">>" }, /*ISOnum , right angle quotation */ {"[raquo ]", ">>" }, /*ISOnum , right angle quotation */
{"[rarr ]", "-->" }, /*ISOnum , rightward arrow */ {"[rarr ]", "-->" }, /*ISOnum , rightward arrow */
{"[rArr ]", "==>>" }, /*ISOtech, right double arrow */ {"[rArr ]", "==>>" }, /*ISOtech, right double arrow */
{"[rcub ]", "}" }, /*ISOnum , right curly brace */ {"[rcub ]", "}" }, /*ISOnum , right curly brace */
{"[rdquo ]", "\"" }, /*ISOnum , right double quote */ {"[rdquo ]", "\"" }, /*ISOnum , right double quote */
/*{"[real ]", " " }, /*ISOamso, real number symbol */ /*{"[real ]", " " }, *ISOamso, real number symbol */
/*{"[reg ]", " " }, /*ISOnum,circledR,registered sign*/ /*{"[reg ]", " " }, *ISOnum,circledR,registered sign*/
/*{"[rho ]", " " }, /*ISOgrk3, Greek, small rho */ /*{"[rho ]", " " }, *ISOgrk3, Greek, small rho */
{"[rpar ]", ")" }, /*ISOnum , right parenthesis */ {"[rpar ]", ")" }, /*ISOnum , right parenthesis */
{"[rsqb ]", "]" }, /*ISOnum , right square bracket */ {"[rsqb ]", "]" }, /*ISOnum , right square bracket */
{"[rsquo ]", "'" }, /*ISOnum , right single quote */ {"[rsquo ]", "'" }, /*ISOnum , right single quote */
/*{"[sect ]", " " }, /*ISOnum , section sign */ /*{"[sect ]", " " }, *ISOnum , section sign */
{"[semi ]", ";" }, /*ISOnum , semicolon */ {"[semi ]", ";" }, /*ISOnum , semicolon */
{"[shy ]", "-" }, /*ISOnum , soft hypen */ {"[shy ]", "-" }, /*ISOnum , soft hypen */
/*{"[sigma ]", " " }, /*ISOgrk3, Greek, small sigma */ /*{"[sigma ]", " " }, *ISOgrk3, Greek, small sigma */
{"[sim ]", "~" }, /*ISOtech, similar to */ {"[sim ]", "~" }, /*ISOtech, similar to */
{"[sime ]", "~=" }, /*ISOtech, similar, equals */ {"[sime ]", "~=" }, /*ISOtech, similar, equals */
{"[sol ]", "/" }, /*ISOnum , solidus */ {"[sol ]", "/" }, /*ISOnum , solidus */
/*{"[spades]", " " }, /*ISOpub , spades suit symbol */ /*{"[spades]", " " }, *ISOpub , spades suit symbol */
/*{"[sub ]", " " }, /*ISOtech, subset/is implied by */ /*{"[sub ]", " " }, *ISOtech, subset/is implied by */
/*{"[sung ]", " " }, /*ISOnum , musical note(sung txt)*/ /*{"[sung ]", " " }, *ISOnum , musical note(sung txt)*/
/*{"[sube ]", " " }, /*ISOtech, subset, equals */ /*{"[sube ]", " " }, *ISOtech, subset, equals */
/*{"[sup ]", " " }, /*ISOtech, superset or implies */ /*{"[sup ]", " " }, *ISOtech, superset or implies */
/*{"[sup1 ]", " " }, /*ISOnum , superscript one */ /*{"[sup1 ]", " " }, *ISOnum , superscript one */
/*{"[sup2 ]", " " }, /*ISOnum , superscript two */ /*{"[sup2 ]", " " }, *ISOnum , superscript two */
/*{"[sup3 ]", " " }, /*ISOnum , superscript three */ /*{"[sup3 ]", " " }, *ISOnum , superscript three */
/*{"[supe ]", " " }, /*ISOtech, superset, equals */ /*{"[supe ]", " " }, *ISOtech, superset, equals */
/*{"[szlig ]", " " }, /*ISOlat1, small sharp s, German */ /*{"[szlig ]", " " }, *ISOlat1, small sharp s, German */
/*{"[tau ]", " " }, /*ISOgrk3, Greek, small tau */ /*{"[tau ]", " " }, *ISOgrk3, Greek, small tau */
/*{"[there4]", " " }, /*ISOtech, therefore */ /*{"[there4]", " " }, *ISOtech, therefore */
/*{"[thetas]", " " }, /*ISOgrk3, Greek, small theta */ /*{"[thetas]", " " }, *ISOgrk3, Greek, small theta */
/*{"[thetav]", " " }, /*ISOgrk3, Greek, small theta,var*/ /*{"[thetav]", " " }, *ISOgrk3, Greek, small theta,var*/
/*{"[thorn ]", " " }, /*ISOlat1, small thorn, Icelandic*/ /*{"[thorn ]", " " }, *ISOlat1, small thorn, Icelandic*/
{"[times ]", "x" }, /*ISOnum , multipy sign */ {"[times ]", "x" }, /*ISOnum , multipy sign */
{"[tprime]", "'''" }, /*ISOtech, triple prime */ {"[tprime]", "'''" }, /*ISOtech, triple prime */
/*{"[trade ]", " " }, /*ISOnum , trade mark sign */ /*{"[trade ]", " " }, *ISOnum , trade mark sign */
/*{"[uacute]", " " }, /*ISOlat1, small u, acute accent */ /*{"[uacute]", " " }, *ISOlat1, small u, acute accent */
/*{"[ucirc ]", " " }, /*ISOlat1, small u, circumflex */ /*{"[ucirc ]", " " }, *ISOlat1, small u, circumflex */
/*{"[ugrave]", " " }, /*ISOlat1, small u, grave accent */ /*{"[ugrave]", " " }, *ISOlat1, small u, grave accent */
/*{"[uarr ]", " " }, /*ISOnum , upward arrow */ /*{"[uarr ]", " " }, *ISOnum , upward arrow */
/*{"[uArr ]", " " }, /*ISOamsa, up double arrow */ /*{"[uArr ]", " " }, *ISOamsa, up double arrow */
/*{"[upsi ]", " " }, /*ISOgrk3, Greek, small upsilon */ /*{"[upsi ]", " " }, *ISOgrk3, Greek, small upsilon */
/*{"[uuml ]", " " }, /*ISOlat1, small u, umlaut mark */ /*{"[uuml ]", " " }, *ISOlat1, small u, umlaut mark */
{"[vellip]", ".\n.\n.\n" }, /*ISOpub , vertical ellipsis */ {"[vellip]", ".\n.\n.\n" }, /*ISOpub , vertical ellipsis */
{"[verbar]", "|" }, /*ISOnum , vertical bar */ {"[verbar]", "|" }, /*ISOnum , vertical bar */
/*{"[weierp]", " " }, /*ISOamso, Weierstrass p */ /*{"[weierp]", " " }, *ISOamso, Weierstrass p */
/*{"[xi ]", " " }, /*ISOgrk3, Greek, small xi */ /*{"[xi ]", " " }, *ISOgrk3, Greek, small xi */
/*{"[yacute]", " " }, /*ISOlat1, small y, acute accent */ /*{"[yacute]", " " }, *ISOlat1, small y, acute accent */
/*{"[yen ]", " " }, /*ISOnum , yen sign */ /*{"[yen ]", " " }, *ISOnum , yen sign */
/*{"[yuml ]", " " }, /*ISOlat1, small y, umlaut mark */ /*{"[yuml ]", " " }, *ISOlat1, small y, umlaut mark */
/*{"[zeta ]", " " }, /*ISOgrk3, Greek, small zeta */ /*{"[zeta ]", " " }, *ISOgrk3, Greek, small zeta */
/*{"[Aacute]", " " }, /*ISOlat1, capital a,acute accent*/ /*{"[Aacute]", " " }, *ISOlat1, capital a,acute accent*/
/*{"[Acirc ]", " " }, /*ISOlat1, capital a,circumflex */ /*{"[Acirc ]", " " }, *ISOlat1, capital a,circumflex */
/*{"[AElig ]", " " }, /*ISOlat1, capital ae diphthong */ /*{"[AElig ]", " " }, *ISOlat1, capital ae diphthong */
/*{"[Agrave]", " " }, /*ISOlat1, capital a,grave accent*/ /*{"[Agrave]", " " }, *ISOlat1, capital a,grave accent*/
/*{"[Aring ]", " " }, /*ISOlat1, capital a,ring */ /*{"[Aring ]", " " }, *ISOlat1, capital a,ring */
/*{"[Atilde]", " " }, /*ISOlat1, capital a,tilde */ /*{"[Atilde]", " " }, *ISOlat1, capital a,tilde */
/*{"[Auml ]", " " }, /*ISOlat1, capital a,umlaut mark */ /*{"[Auml ]", " " }, *ISOlat1, capital a,umlaut mark */
/*{"[Ccedil]", " " }, /*ISOlat1, capital c, cedilla */ /*{"[Ccedil]", " " }, *ISOlat1, capital c, cedilla */
/*{"[Delta ]", " " }, /*ISOgrk3, Greek, large delta */ /*{"[Delta ]", " " }, *ISOgrk3, Greek, large delta */
/*{"[Dot ]", " " }, /*ISOtech, dieresis or umlaut mrk*/ /*{"[Dot ]", " " }, *ISOtech, dieresis or umlaut mrk*/
/*{"[DotDot]", " " }, /*ISOtech, four dots above */ /*{"[DotDot]", " " }, *ISOtech, four dots above */
/*{"[Eacute]", " " }, /*ISOlat1, capital E,acute accent*/ /*{"[Eacute]", " " }, *ISOlat1, capital E,acute accent*/
/*{"[Ecirc ]", " " }, /*ISOlat1, capital E,circumflex */ /*{"[Ecirc ]", " " }, *ISOlat1, capital E,circumflex */
/*{"[Egrave]", " " }, /*ISOlat1, capital E,grave accent*/ /*{"[Egrave]", " " }, *ISOlat1, capital E,grave accent*/
/*{"[ETH ]", " " }, /*ISOlat1, capital Eth, Icelandic*/ /*{"[ETH ]", " " }, *ISOlat1, capital Eth, Icelandic*/
/*{"[Euml ]", " " }, /*ISOlat1, capital E,umlaut mark */ /*{"[Euml ]", " " }, *ISOlat1, capital E,umlaut mark */
/*{"[Gamma ]", " " }, /*ISOgrk3, Greek, large gamma */ /*{"[Gamma ]", " " }, *ISOgrk3, Greek, large gamma */
/*{"[Iacute]", " " }, /*ISOlat1, capital I,acute accent*/ /*{"[Iacute]", " " }, *ISOlat1, capital I,acute accent*/
/*{"[Icirc ]", " " }, /*ISOlat1, capital I,circumflex */ /*{"[Icirc ]", " " }, *ISOlat1, capital I,circumflex */
/*{"[Igrave]", " " }, /*ISOlat1, capital I,grave accent*/ /*{"[Igrave]", " " }, *ISOlat1, capital I,grave accent*/
/*{"[Iuml ]", " " }, /*ISOlat1, capital I,umlaut mark */ /*{"[Iuml ]", " " }, *ISOlat1, capital I,umlaut mark */
/*{"[Lambda]", " " }, /*ISOgrk3, Greek, large lambda */ /*{"[Lambda]", " " }, *ISOgrk3, Greek, large lambda */
/*{"[Ntilde]", " " }, /*ISOlat1, capital N, tilde */ /*{"[Ntilde]", " " }, *ISOlat1, capital N, tilde */
/*{"[Oacute]", " " }, /*ISOlat1, capital O,acute accent*/ /*{"[Oacute]", " " }, *ISOlat1, capital O,acute accent*/
/*{"[Ocirc ]", " " }, /*ISOlat1, capital O,circumflex */ /*{"[Ocirc ]", " " }, *ISOlat1, capital O,circumflex */
/*{"[Ograve]", " " }, /*ISOlat1, capital O,grave accent*/ /*{"[Ograve]", " " }, *ISOlat1, capital O,grave accent*/
/*{"[Omega ]", " " }, /*ISOgrk3, Greek, large omega */ /*{"[Omega ]", " " }, *ISOgrk3, Greek, large omega */
/*{"[Oslash]", " " }, /*ISOlat1, capital O, slash */ /*{"[Oslash]", " " }, *ISOlat1, capital O, slash */
/*{"[Otilde]", " " }, /*ISOlat1, capital O, tilde */ /*{"[Otilde]", " " }, *ISOlat1, capital O, tilde */
/*{"[Ouml ]", " " }, /*ISOlat1, capital O,umlaut mark */ /*{"[Ouml ]", " " }, *ISOlat1, capital O,umlaut mark */
/*{"[Pi ]", " " }, /*ISOgrk3, Greek, large pi */ /*{"[Pi ]", " " }, *ISOgrk3, Greek, large pi */
{"[Prime ]", "\"" }, /*ISOtech, double prime/second */ {"[Prime ]", "\"" }, /*ISOtech, double prime/second */
/*{"[Phi ]", " " }, /*ISOgrk3, Greek, large phi */ /*{"[Phi ]", " " }, *ISOgrk3, Greek, large phi */
/*{"[Psi ]", " " }, /*ISOgrk3, Greek, large psi */ /*{"[Psi ]", " " }, *ISOgrk3, Greek, large psi */
/*{"[Sigma ]", " " }, /*ISOgrk3, Greek, large sigma */ /*{"[Sigma ]", " " }, *ISOgrk3, Greek, large sigma */
/*{"[Theta ]", " " }, /*ISOgrk3, Greek, large theta */ /*{"[Theta ]", " " }, *ISOgrk3, Greek, large theta */
/*{"[THORN ]", " " }, /*ISOlat1,capital THORN,Icelandic*/ /*{"[THORN ]", " " }, *ISOlat1,capital THORN,Icelandic*/
/*{"[Uacute]", " " }, /*ISOgrk3, Greek, large theta */ /*{"[Uacute]", " " }, *ISOgrk3, Greek, large theta */
/*{"[Ucirc ]", " " }, /*ISOlat1, capital U,acute accent*/ /*{"[Ucirc ]", " " }, *ISOlat1, capital U,acute accent*/
/*{"[Ugrave]", " " }, /*ISOlat1, capital U,circumflex */ /*{"[Ugrave]", " " }, *ISOlat1, capital U,circumflex */
/*{"[Upsi ]", " " }, /*ISOgrk3, Greek, large upsilon */ /*{"[Upsi ]", " " }, *ISOgrk3, Greek, large upsilon */
/*{"[Uuml ]", " " }, /*ISOlat1, capital U,umlaut mark */ /*{"[Uuml ]", " " }, *ISOlat1, capital U,umlaut mark */
{"[Verbar]", "||" }, /*ISOtech, dbl vertical bar */ {"[Verbar]", "||" }, /*ISOtech, dbl vertical bar */
/*{"[Xi ]", " " }, /*ISOgrk3, Greek, large xi */ /*{"[Xi ]", " " }, *ISOgrk3, Greek, large xi */
/*{"[Yacute]", " " }, /*ISOlat1, capital Y,acute accent*/ /*{"[Yacute]", " " }, *ISOlat1, capital Y,acute accent*/
{ NULL , " " }, /* default character to use */ { NULL , " " }, /* default character to use */
}; };

2
cde/lib/DtHelp/XInterface.c
View file

@ -337,7 +337,7 @@ static SpecialSymbolTable SpcTable[] =
{"[spades]", {'\252','\0'}, SymbolString}, /*ISOpub , spades suit symbol */ {"[spades]", {'\252','\0'}, SymbolString}, /*ISOpub , spades suit symbol */
{"[sub ]", {'\314','\0'}, SymbolString}, /*ISOtech, subset/is implied by */ {"[sub ]", {'\314','\0'}, SymbolString}, /*ISOtech, subset/is implied by */
{"[sube ]", {'\315','\0'}, SymbolString}, /*ISOtech, subset, equals */ {"[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 */ {"[sup ]", {'\311','\0'}, SymbolString}, /*ISOtech, superset or implies */
{"[sup1 ]", {'\271','\0'}, IsoString }, /*ISOnum , superscript one */ {"[sup1 ]", {'\271','\0'}, IsoString }, /*ISOnum , superscript one */
{"[sup2 ]", {'\262','\0'}, IsoString }, /*ISOnum , superscript two */ {"[sup2 ]", {'\262','\0'}, IsoString }, /*ISOnum , superscript two */

1
cde/lib/DtSearch/raima/dio.c
View file

@ -117,6 +117,7 @@
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <time.h>
#include "vista.h" #include "vista.h"
#include "dbtype.h" #include "dbtype.h"
#include "dbswab.h" #include "dbswab.h"

1
cde/lib/DtSearch/raima/initial.c
View file

@ -51,6 +51,7 @@
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <time.h>
#include "vista.h" #include "vista.h"
#include "dbtype.h" #include "dbtype.h"
#include "dbswab.h" #include "dbswab.h"

2
cde/lib/DtSvc/DtCodelibs/Imakefile
View file

@ -17,7 +17,7 @@ XCOMM (c) Copyright 1996 Hitachi.
#define LibCreate NO #define LibCreate NO
#define CplusplusSource YES #define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include <Threads.tmpl> #include <Threads.tmpl>

4
cde/lib/DtSvc/DtEncap/pty.c
View file

@ -61,10 +61,6 @@
#include <sys/ptyio.h> #include <sys/ptyio.h>
#endif #endif
#if defined(__cplusplus)
#include <osfcn.h>
#endif
#if defined(__apollo) && !defined(ONLCR) #if defined(__apollo) && !defined(ONLCR)
# define ONLCR 0 /* This guy (XPG3), not on apollo yet */ # define ONLCR 0 /* This guy (XPG3), not on apollo yet */
#endif #endif

4
cde/lib/DtSvc/DtUtil1/DbLoad.c
View file

@ -53,11 +53,11 @@
#include <ndir.h> #include <ndir.h>
#else #else
#if defined(sun) #if defined(sun) || defined(CSRG_BASED)
#include <dirent.h> #include <dirent.h>
#else #else
#include <sys/dir.h> #include <sys/dir.h>
#endif /* sun */ #endif /* sun || CSRD_BASED */
#endif /* __hpux */ #endif /* __hpux */

4
cde/lib/DtSvc/DtUtil1/DtsInit.c
View file

@ -51,11 +51,11 @@
#include <ndir.h> #include <ndir.h>
#else #else
#if defined(sun) #if defined(sun) || defined(CSRG_BASED)
#include <dirent.h> #include <dirent.h>
#else #else
#include <sys/dir.h> #include <sys/dir.h>
#endif /* sun */ #endif /* sun || CSRG_BASED */
#endif /* __hpux */ #endif /* __hpux */

3
cde/lib/DtSvc/DtUtil2/DtosP.h
View file

@ -150,6 +150,9 @@ static char SCCSID[] = "OSF/Motif: @(#)_DtosP.h 4.16 91/09/12";
# ifdef __GNUC__ # ifdef __GNUC__
# ifdef alloca
# undef alloca
# endif
# define alloca __builtin_alloca # define alloca __builtin_alloca
# define ALLOCATE_LOCAL(size) alloca((int)(size)) # define ALLOCATE_LOCAL(size) alloca((int)(size))
# define DEALLOCATE_LOCAL(ptr) /* as nothing */ # define DEALLOCATE_LOCAL(ptr) /* as nothing */

4
cde/lib/DtSvc/DtUtil2/FileUtil.c
View file

@ -40,11 +40,11 @@
#ifdef __hpux #ifdef __hpux
#include <ndir.h> /* opendir(), directory(3C) */ #include <ndir.h> /* opendir(), directory(3C) */
#else #else
#if defined(sun) #if defined(sun) || defined(CSRG_BASED)
#include <dirent.h> /* opendir(), directory(3C) */ #include <dirent.h> /* opendir(), directory(3C) */
#else #else
#include <sys/dir.h> #include <sys/dir.h>
#endif /* sun */ #endif /* sun || CSRG_BASED */
#endif /* __hpux */ #endif /* __hpux */
#include <X11/Xlib.h> #include <X11/Xlib.h>

2
cde/lib/DtSvc/DtUtil2/Utility.c
View file

@ -38,7 +38,7 @@
#ifdef __hpux #ifdef __hpux
#include <ndir.h> #include <ndir.h>
#else #else
#if defined(sun) #if defined(sun) || defined(CSRG_BASED)
#include <dirent.h> #include <dirent.h>
#else #else
#include <sys/dir.h> #include <sys/dir.h>

2
cde/lib/DtSvc/include/bms/usersig.h
View file

@ -33,7 +33,7 @@
*/ */
#ifndef _usersig_h #ifndef _usersig_h
#define _usesig_h #define _usersig_h
/* -------------------------------------------- */ /* -------------------------------------------- */
/* Requires: */ /* Requires: */

8
cde/lib/DtTerm/TermPrim/TermPrimSetPty.c
View file

@ -111,6 +111,12 @@ static char rcs_id[] = "$TOG: TermPrimSetPty.c /main/2 1998/04/03 17:11:24 mgree
#define NXTTYMODES 16 #define NXTTYMODES 16
#if defined(CSRG_BASED) #if defined(CSRG_BASED)
#ifdef TAB3
#undef TAB3
#endif
#ifdef TABDLY
#undef TABDLY
#endif
#define TAB3 0x00000000 #define TAB3 0x00000000
#define NLDLY 0x00000000 #define NLDLY 0x00000000
#define CRDLY 0x00000000 #define CRDLY 0x00000000
@ -158,7 +164,7 @@ parseTtyModes
) )
{ {
ttyMode *pMode; ttyMode *pMode;
int c, i; int c;
int modeCount = 0; int modeCount = 0;
/* /*

2
cde/lib/tt/bin/shell/Imakefile
View file

@ -1,7 +1,7 @@
XCOMM $XConsortium: Imakefile /main/10 1996/05/08 09:27:50 drk $ XCOMM $XConsortium: Imakefile /main/10 1996/05/08 09:27:50 drk $
#define CplusplusSource YES #define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB) EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include <Threads.tmpl> #include <Threads.tmpl>

2
cde/lib/tt/lib/api/c/api_typecb_utils.h
View file

@ -33,7 +33,7 @@
* *
* Utilities declarations for _Tt_typecb * Utilities declarations for _Tt_typecb
*/ */
#ifndef _API_TYPECB__UTILS_H #ifndef _API_TYPECB_UTILS_H
#define _API_TYPECB_UTILS_H #define _API_TYPECB_UTILS_H
#include "util/tt_object.h" #include "util/tt_object.h"
#include "util/tt_list.h" #include "util/tt_list.h"

2
cde/programs/dtappbuilder/src/abmf/obj_namesP.h
View file

@ -43,7 +43,7 @@
/* /*
* obj_namesP.h - C/Widget/other names for objects * obj_namesP.h - C/Widget/other names for objects
*/ */
#ifndef _ABMF_OBJ_NAMES__H_ #ifndef _ABMF_OBJ_NAMESP_H_
#define _ABMF_OBJ_NAMESP_H_ #define _ABMF_OBJ_NAMESP_H_
#include "write_codeP.h" #include "write_codeP.h"

2
cde/programs/dtappbuilder/src/libABobj/obj_notifyP.h
View file

@ -45,7 +45,7 @@
* *
* Internal files - defines internal data structures, et cetera * Internal files - defines internal data structures, et cetera
*/ */
#ifndef _ABOBJ_NOTIFYP_H #ifndef _ABOBJ_NOTIFYP_H_
#define _ABOBJ_NOTIFYP_H_ #define _ABOBJ_NOTIFYP_H_
#include "objP.h" /* include before obj.h! */ #include "objP.h" /* include before obj.h! */

2
cde/programs/dtcm/libDtCmP/getdate.h
View file

@ -52,7 +52,7 @@
#ifndef _GETDATE_H #ifndef _GETDATE_H
#define _GETDATE_H #define _GETDATE_H
#if defined(USG) || defined(__OpenBSD__) #if defined(USG) || defined(CSRG_BASED)
struct timeb struct timeb
{ {
time_t time; time_t time;

2
cde/programs/dtcm/libDtCmP/util.c
View file

@ -61,6 +61,8 @@
#include <sys/utsname.h> /* SYS_NMLN */ #include <sys/utsname.h> /* SYS_NMLN */
#if defined(sun) #if defined(sun)
#include <sys/systeminfo.h> #include <sys/systeminfo.h>
#elif defined(CSRG_BASED)
#include <sys/dirent.h>
#else #else
#include <sys/dir.h> #include <sys/dir.h>
#endif /* sun */ #endif /* sun */

3
cde/programs/dthelp/parser/canon1/util/entdef.h
View file

@ -30,6 +30,9 @@
#define M_ENDTAG 3 #define M_ENDTAG 3
#define M_MD 4 #define M_MD 4
#define M_MS 5 #define M_MS 5
#ifdef M_PI
#undef M_PI
#endif
#define M_PI 6 #define M_PI 6
#define M_CDATAENT 7 #define M_CDATAENT 7
#define M_SDATA 8 #define M_SDATA 8

3
cde/programs/dthelp/parser/pass1/util/entdef.h
View file

@ -30,6 +30,9 @@
#define M_ENDTAG 3 #define M_ENDTAG 3
#define M_MD 4 #define M_MD 4
#define M_MS 5 #define M_MS 5
#ifdef M_PI
#undef M_PI
#endif
#define M_PI 6 #define M_PI 6
#define M_CDATAENT 7 #define M_CDATAENT 7
#define M_SDATA 8 #define M_SDATA 8

3
cde/programs/dthelp/parser/pass2/util/entdef.h
View file

@ -30,6 +30,9 @@
#define M_ENDTAG 3 #define M_ENDTAG 3
#define M_MD 4 #define M_MD 4
#define M_MS 5 #define M_MS 5
#ifdef M_PI
#undef M_PI
#endif
#define M_PI 6 #define M_PI 6
#define M_CDATAENT 7 #define M_CDATAENT 7
#define M_SDATA 8 #define M_SDATA 8

2
cde/programs/dtinfo/DtMmdb/HardCopy/HardCopyFP.C
View file

@ -63,7 +63,7 @@ const char* loutFeatureProcessor::convertToLiteral(const char* str)
if ( literalBufferSize < 2*size + 3 ) { if ( literalBufferSize < 2*size + 3 ) {
literalBufferSize = 2*size + 3; literalBufferSize = 2*size + 3;
literalBufferSize *= 2; literalBufferSize *= 2;
delete literalBuffer; delete [] literalBuffer;
literalBuffer = new char[literalBufferSize]; literalBuffer = new char[literalBufferSize];
} }

2
cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C
View file

@ -47,7 +47,7 @@ static ostrstream& terminate(ostrstream& ost)
#endif #endif
DocParser::DocParser(Resolver &r) DocParser::DocParser(Resolver &r)
: f_resolver(r), f_ignoring_element(0), : f_ignoring_element(0), f_resolver(r),
#if defined(SC3) #if defined(SC3)
f_buffer(new char[DATA_BUF_SIZ]), f_buffer(new char[DATA_BUF_SIZ]),
f_output(f_buffer, DATA_BUF_SIZ) f_output(f_buffer, DATA_BUF_SIZ)

1
cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.C
View file

@ -22,6 +22,7 @@
*/ */
// $TOG: defParser.C /main/5 1997/12/23 11:16:25 bill $ // $TOG: defParser.C /main/5 1997/12/23 11:16:25 bill $
#ifndef lint #ifndef lint
__attribute__((unused))
static const char defParsersccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90"; static const char defParsersccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90";
#endif #endif
#define defParserBYACC 1 #define defParserBYACC 1

2
cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C
View file

@ -235,7 +235,7 @@ void addToDefTokenStringBuf(const unsigned char* str, int size)
defToken_string_buf_size = 2*(size+defToken_string_buf_content_size); defToken_string_buf_size = 2*(size+defToken_string_buf_content_size);
unsigned char* x = new unsigned char[defToken_string_buf_size]; unsigned char* x = new unsigned char[defToken_string_buf_size];
memcpy(x, defToken_string_buf, defToken_string_buf_content_size); memcpy(x, defToken_string_buf, defToken_string_buf_content_size);
delete defToken_string_buf; delete [] defToken_string_buf;
defToken_string_buf = x; defToken_string_buf = x;
} }

2
cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.l
View file

@ -51,7 +51,7 @@ void addToDefTokenStringBuf(const unsigned char* str, int size)
defToken_string_buf_size = 2*(size+defToken_string_buf_content_size); defToken_string_buf_size = 2*(size+defToken_string_buf_content_size);
unsigned char* x = new unsigned char[defToken_string_buf_size]; unsigned char* x = new unsigned char[defToken_string_buf_size];
memcpy(x, defToken_string_buf, defToken_string_buf_content_size); memcpy(x, defToken_string_buf, defToken_string_buf_content_size);
delete defToken_string_buf; delete [] defToken_string_buf;
defToken_string_buf = x; defToken_string_buf = x;
} }

1
cde/programs/dtinfo/DtMmdb/StyleSheet/style.C
View file

@ -22,6 +22,7 @@
*/ */
// $TOG: style.C /main/6 1998/04/17 11:51:49 mgreess $ // $TOG: style.C /main/6 1998/04/17 11:51:49 mgreess $
#ifndef lint #ifndef lint
__attribute__((unused))
static const char stylesccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90"; static const char stylesccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90";
#endif #endif
#define styleBYACC 1 #define styleBYACC 1

4
cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C
View file

@ -263,7 +263,7 @@ void addToQstringBuf(const unsigned char* str, int size)
qstring_buf_size = 2*(size+qstring_buf_content_size); qstring_buf_size = 2*(size+qstring_buf_content_size);
unsigned char* x = new unsigned char[qstring_buf_size]; unsigned char* x = new unsigned char[qstring_buf_size];
memcpy(x, qstring_buf, qstring_buf_content_size); memcpy(x, qstring_buf, qstring_buf_content_size);
delete qstring_buf; delete [] qstring_buf;
qstring_buf = x; qstring_buf = x;
} }
@ -699,7 +699,7 @@ case 2:
# line 99 "tokenStyle.l" # line 99 "tokenStyle.l"
{ {
if ( commentBufferSize < styleleng ) { if ( commentBufferSize < styleleng ) {
delete commentBuffer; delete [] commentBuffer;
commentBufferSize = 2 * styleleng ; commentBufferSize = 2 * styleleng ;
commentBuffer = new char [commentBufferSize]; commentBuffer = new char [commentBufferSize];
} }

4
cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.l
View file

@ -77,7 +77,7 @@ void addToQstringBuf(const unsigned char* str, int size)
qstring_buf_size = 2*(size+qstring_buf_content_size); qstring_buf_size = 2*(size+qstring_buf_content_size);
unsigned char* x = new unsigned char[qstring_buf_size]; unsigned char* x = new unsigned char[qstring_buf_size];
memcpy(x, qstring_buf, qstring_buf_content_size); memcpy(x, qstring_buf, qstring_buf_content_size);
delete qstring_buf; delete [] qstring_buf;
qstring_buf = x; 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 ) { if ( commentBufferSize < yyleng ) {
delete commentBuffer; delete [] commentBuffer;
commentBufferSize = 2 * yyleng ; commentBufferSize = 2 * yyleng ;
commentBuffer = new char [commentBufferSize]; commentBuffer = new char [commentBufferSize];
} }

2
cde/programs/dtinfo/DtMmdb/compression/code.C
View file

@ -51,7 +51,7 @@
#include "compression/code.h" #include "compression/code.h"
encoding_unit::encoding_unit(ostring* w, unsigned int f) : 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)
{ {
} }

2
cde/programs/dtinfo/DtMmdb/dti_excs/Exception.C
View file

@ -40,7 +40,7 @@ char *Exception::g_next_avail = Exception::g_temp_space;
// ///////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////
Exception::Exception() 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)); PRINTF (("Constructed Exception obj @ %p\n", this));
} }

2
cde/programs/dtinfo/DtMmdb/object/oid_list.C
View file

@ -439,7 +439,7 @@ io_status oid_list::asciiIn(istream& in)
list_ptr.p -> set(oid_array, v_sz); list_ptr.p -> set(oid_array, v_sz);
} }
delete oid_array; delete [] oid_array;
return done; return done;
} }

1
cde/programs/dtinfo/DtMmdb/schema/sheet.C
View file

@ -22,6 +22,7 @@
*/ */
// $TOG: sheet.C /main/4 1997/12/23 11:20:35 bill $ // $TOG: sheet.C /main/4 1997/12/23 11:20:35 bill $
#ifndef lint #ifndef lint
__attribute__((unused))
static const char schemasccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90"; static const char schemasccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90";
#endif #endif
#define schemaBYACC 1 #define schemaBYACC 1

2
cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh
View file

@ -57,9 +57,9 @@ public:
BookmarkEdit (UAS_Pointer<Mark> &mark) BookmarkEdit (UAS_Pointer<Mark> &mark)
: f_mark_ptr (mark), : f_mark_ptr (mark),
f_shell (NULL), f_shell (NULL),
f_modified (FALSE),
f_name_text(NULL), f_name_text(NULL),
f_notes_text(NULL), f_notes_text(NULL),
f_modified (FALSE),
f_wm_delete_callback(NULL) f_wm_delete_callback(NULL)
{ {
MarkMgr::request ((UAS_Receiver<MarkMoved> *) this); MarkMgr::request ((UAS_Receiver<MarkMoved> *) this);

10
cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C
View file

@ -118,15 +118,15 @@ GraphicAgent::GraphicAgent (UAS_Pointer<UAS_Common> &node_ptr,
: f_shell (NULL), : f_shell (NULL),
f_node_ptr(node_ptr), f_node_ptr(node_ptr),
f_graphic (gr), f_graphic (gr),
f_panner_state (PANNER_NONE),
f_current_scale (100),
f_scale_button(NULL),
f_setcustom(0),
f_panner(NULL), f_panner(NULL),
f_pixmap_widget(NULL), f_pixmap_widget(NULL),
f_panner_state (PANNER_NONE),
f_current_scale (100),
f_view_menu(NULL), f_view_menu(NULL),
f_message_area(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); f_graphic->pixmap_graphic()->agent(this);

4
cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.hh
View file

@ -152,14 +152,13 @@ private: // variables
inline inline
LibraryAgent::LibraryAgent() LibraryAgent::LibraryAgent()
: f_shell (NULL), : f_shell (NULL),
f_doc_tree_view(),
f_oe (NULL), f_oe (NULL),
f_keep_forever (FALSE), f_keep_forever (FALSE),
f_wm_delete_callback (NULL), f_wm_delete_callback (NULL),
f_tracking_hierarchy (NULL), f_tracking_hierarchy (NULL),
f_popped_down (TRUE), f_popped_down (TRUE),
f_close (NULL), f_close (NULL),
f_close_sensitive (FALSE),
f_doc_tree_view(),
f_copy(NULL), f_copy(NULL),
f_detach(NULL), f_detach(NULL),
f_detach2(NULL), f_detach2(NULL),
@ -171,6 +170,7 @@ LibraryAgent::LibraryAgent()
f_remove(NULL), f_remove(NULL),
f_remove2(NULL), f_remove2(NULL),
f_auto_track(NULL), f_auto_track(NULL),
f_close_sensitive (FALSE),
f_status_text(NULL), f_status_text(NULL),
f_scope_menu(NULL) f_scope_menu(NULL)

6
cde/programs/dtinfo/dtinfo/src/Agents/MapAgentMotif.C
View file

@ -219,15 +219,15 @@ MapButton::destroy()
// ///////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////
MapAgent::MapAgent() MapAgent::MapAgent()
: f_shell (NULL), : f_locked(FALSE),
f_onscreen (FALSE),
f_locked(FALSE),
f_map_mode(LOCAL_MODE), f_map_mode(LOCAL_MODE),
f_shell (NULL),
f_porthole(NULL), f_porthole(NULL),
f_panner(NULL), f_panner(NULL),
f_tree(NULL), f_tree(NULL),
f_wm_delete_callback(NULL), f_wm_delete_callback(NULL),
f_lock(NULL), f_lock(NULL),
f_onscreen (FALSE),
f_min_tree_width(0), f_min_tree_width(0),
f_min_tree_height(0) f_min_tree_height(0)
{ {

4
cde/programs/dtinfo/dtinfo/src/Agents/MarkChooser.C
View file

@ -84,8 +84,8 @@
MarkChooser::MarkChooser (Widget parent, xList<MarkCanvas *> &marks, MarkChooser::MarkChooser (Widget parent, xList<MarkCanvas *> &marks,
const char *title_key, const char *ok_key) const char *title_key, const char *ok_key)
: f_selected_item (-1), : 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); create_ui (parent, title_key, ok_key);
update_list(); update_list();

6
cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.C
View file

@ -81,9 +81,9 @@
// ///////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////
MarkListView::MarkListView() MarkListView::MarkListView()
: f_shell (NULL), : f_selected_item(0),
f_popped_up (FALSE), f_shell (NULL),
f_selected_item(0) f_popped_up (FALSE)
{ {
} }

2
cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.hh
View file

@ -94,8 +94,8 @@ private: // variables
inline inline
MessageAgent::MessageAgent() MessageAgent::MessageAgent()
: f_dialog (NULL), : f_dialog (NULL),
f_exit_flag (False),
f_text(NULL), f_text(NULL),
f_exit_flag (False),
f_real_parent(NULL), f_real_parent(NULL),
f_popped_up(FALSE), f_popped_up(FALSE),
f_pressed_ok(FALSE) f_pressed_ok(FALSE)

22
cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C
View file

@ -778,16 +778,6 @@ NodeWindowAgent::NodeWindowAgent (u_int serial_no)
f_shell (NULL), f_shell (NULL),
f_help_dsp_area (NULL), f_help_dsp_area (NULL),
f_close(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_frame(NULL),
f_create_bmrk(NULL), f_create_bmrk(NULL),
f_create_anno(NULL), f_create_anno(NULL),
@ -810,10 +800,20 @@ NodeWindowAgent::NodeWindowAgent (u_int serial_no)
f_print(NULL), f_print(NULL),
f_print2(NULL), f_print2(NULL),
f_print_as(NULL), f_print_as(NULL),
f_current_ancestor (NULL),
f_form(NULL),
f_move_mark_sensitive(0), f_move_mark_sensitive(0),
f_last_access_time(0), f_last_access_time(0),
f_locked(FALSE), 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<UAS_LibraryDestroyedMsg> *) this); UAS_Common::request ((UAS_Receiver<UAS_LibraryDestroyedMsg> *) this);

5
cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C
View file

@ -151,9 +151,8 @@ static Boolean print_hierarchy; // keep track of hierarchy vs section
#if 0 && defined(PRINTING_SUPPORTED) #if 0 && defined(PRINTING_SUPPORTED)
static void PrintEverything(AppPrintData *p); static void PrintEverything(AppPrintData *p);
#endif /* PRINTING_SUPPORTED */
static void PrintOneUASCommon(UAS_Pointer<UAS_Common> &doc, Widget pshell, int *cur_pageP); static void PrintOneUASCommon(UAS_Pointer<UAS_Common> &doc, Widget pshell, int *cur_pageP);
#endif /* PRINTING_SUPPORTED */
PrintPanelAgent::PrintPanelAgent() PrintPanelAgent::PrintPanelAgent()
{ {
@ -963,7 +962,6 @@ PrintEverything(AppPrintData *p)
RCS_DEBUG("PrintEverything exiting.\n"); RCS_DEBUG("PrintEverything exiting.\n");
} }
#endif /* PRINTING_SUPPORTED */
static void static void
PrintOneUASCommon(UAS_Pointer<UAS_Common> &doc, Widget pshell, int *cur_pageP) PrintOneUASCommon(UAS_Pointer<UAS_Common> &doc, Widget pshell, int *cur_pageP)
@ -1030,6 +1028,7 @@ PrintOneUASCommon(UAS_Pointer<UAS_Common> &doc, Widget pshell, int *cur_pageP)
} }
} }
} }
#endif /* PRINTING_SUPPORTED */
/* /*
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------

8
cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.hh
View file

@ -115,9 +115,9 @@ protected: // variables
inline inline
SearchResultsAgent::SearchResultsAgent() SearchResultsAgent::SearchResultsAgent()
: f_work_proc_id (0), f_popped_up(FALSE), f_my_ale(NULL), f_retain(FALSE), : f_my_ale(NULL), f_retain(FALSE), f_results(NULL), f_selected_item(0),
f_results(NULL), f_selected_item(0), f_retain_toggle(NULL), f_query_text(NULL), f_retain_toggle(NULL), f_query_text(NULL), f_hits_label(NULL),
f_hits_label(NULL), f_scope_label(NULL), f_docs_to_display(0), f_count(0), f_scope_label(NULL), f_docs_to_display(0), f_count(0), f_scale(0),
f_scale(0), f_header_indent(0) f_work_proc_id(0), f_popped_up(FALSE), f_header_indent(0)
{ {
} }

4
cde/programs/dtinfo/dtinfo/src/Basic/Buffer.hh
View file

@ -75,8 +75,8 @@ public:
void write (const int integer); void write (const int integer);
void write (const size_t integer) void write (const unsigned int integer)
{ write ((size_t) ((void *) integer)); } { write ((int) (integer)); }
void write (const char *string); void write (const char *string);
void write (const char *bytes, u_int size, u_int length); void write (const char *bytes, u_int size, u_int length);

2
cde/programs/dtinfo/dtinfo/src/Basic/List.C
View file

@ -121,8 +121,6 @@ List::append (FolioObject &element)
check_space(); check_space();
/* -------- Add the element. -------- */ /* -------- Add the element. -------- */
if (&element == NULL)
abort();
f_list_element[f_length] = &element; f_list_element[f_length] = &element;
f_length++; f_length++;
notify (APPENDED, (void *)(size_t) (f_length - 1)); notify (APPENDED, (void *)(size_t) (f_length - 1));

2
cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C
View file

@ -429,7 +429,7 @@ olias_send_event (Widget, OliasEvent *event)
if (locator == NULL) if (locator == NULL)
return (OLIAS_TIMEOUT); return (OLIAS_TIMEOUT);
ON_DEBUG(printf(">>> g_top_locator = %p\n", g_top_locator)); 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); return (OLIAS_TIMEOUT);
g_scroll_to_locator = TRUE; g_scroll_to_locator = TRUE;
len = MIN(strlen(locator), 4096 - 1); len = MIN(strlen(locator), 4096 - 1);

12
cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C
View file

@ -231,16 +231,16 @@ print_justify (unsigned value)
CanvasRenderer::CanvasRenderer(int font_scale) CanvasRenderer::CanvasRenderer(int font_scale)
: Renderer(), : Renderer(),
f_vcc(0),
f_current_container(NULL),
f_current_displayable(NULL),
f_current_tgroup (0), f_current_tgroup (0),
f_font (0), f_font (0),
f_link_idx (-1), f_link_idx (-1),
f_font_scale(font_scale), f_font_scale(font_scale),
f_default_features(NULL),
fBogusSymbol(gElemSymTab->intern("%BOGUS")), fBogusSymbol(gElemSymTab->intern("%BOGUS")),
f_level(0), f_level(0)
f_vcc(0),
f_current_container(NULL),
f_current_displayable(NULL),
f_default_features(NULL)
{ {
// make symbols // make symbols
for ( int i=0; i < REND_SYMBOLS; i++) for ( int i=0; i < REND_SYMBOLS; i++)
@ -2534,7 +2534,7 @@ TGDefn::build()
delete grid[r] ; // clean up column memory delete grid[r] ; // clean up column memory
} }
delete grid ; delete [] grid ;
// now apply the formats to the _DtCvTable // now apply the formats to the _DtCvTable
{ {

20
cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C
View file

@ -226,8 +226,8 @@ public:
Shell_Info (Widget w) Shell_Info (Widget w)
: f_shell (w), : f_shell (w),
f_size_hints (NULL), f_size_hints (NULL),
f_restore (False),
f_has_size_hints(False), f_has_size_hints(False),
f_restore (False),
f_iconic(False), f_iconic(False),
f_has_wm_state(False) f_has_wm_state(False)
{ } { }
@ -247,22 +247,22 @@ public:
// ///////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////
WindowSystem::WindowSystem (int &argc, char *argv[]) WindowSystem::WindowSystem (int &argc, char *argv[])
: f_printing(False), : f_print_display(NULL),
f_printing(False),
f_default_pixmap (0), f_default_pixmap (0),
f_default_print_pixmap(0),
f_defpix_width (0), f_defpix_width (0),
f_defpix_height (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_width(0),
f_print_defpix_height(0), f_print_defpix_height(0),
f_detached_pixmap(0),
f_detached_width(0), f_detached_width(0),
f_detached_height(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_argc = &argc;
f_argv = argv; f_argv = argv;

4
cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C
View file

@ -105,8 +105,8 @@ QueryEditor::QueryEditor(UAS_SearchEngine& search_engine)
: f_query (NULL), : f_query (NULL),
f_query_view (NULL), f_query_view (NULL),
f_shell (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; f_query_editor = this;

2
cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C
View file

@ -60,12 +60,14 @@ using namespace std;
#include "dbug.h" /* ala Fred Fish's dbug package from uunet */ #include "dbug.h" /* ala Fred Fish's dbug package from uunet */
#endif #endif
#ifdef LICENSE_MANAGEMENT
const int A_FEATURE = OLAF::Feature; const int A_FEATURE = OLAF::Feature;
const int A_VEN_CODE = OLAF::VenCode; const int A_VEN_CODE = OLAF::VenCode;
const int A_VERSION = OLAF::Version; const int A_VERSION = OLAF::Version;
const int A_GROUPING = OLAF::Grouping; const int A_GROUPING = OLAF::Grouping;
const int A_DEMO_TERMS = OLAF::DemoTerms; const int A_DEMO_TERMS = OLAF::DemoTerms;
const int A_DEFAULT_SECTION = OLAF::DefaultSection; const int A_DEFAULT_SECTION = OLAF::DefaultSection;
#endif
/*********************************** /***********************************
* *

1
cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.C
View file

@ -22,6 +22,7 @@
*/ */
/* $TOG: OL_DataExpr.C /main/4 1997/12/23 11:38:27 bill $ */ /* $TOG: OL_DataExpr.C /main/4 1997/12/23 11:38:27 bill $ */
#ifndef lint #ifndef lint
__attribute__((unused))
static const char ol_datasccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90"; static const char ol_datasccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90";
#endif #endif
#define ol_dataBYACC 1 #define ol_dataBYACC 1

4
cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c
View file

@ -235,7 +235,7 @@ static char *buildSpec(void);
static void defaultGlobals(void); static void defaultGlobals(void);
static void checkGlobals(void); static void checkGlobals(void);
static int parseArgs(int argc, char *argv[]); 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 void buildBookcase(char *cmdSrc, char *dirName);
static char *storeBookCase(char *cmdSrc, char *tocOpt, char *dbName, static char *storeBookCase(char *cmdSrc, char *tocOpt, char *dbName,
char *dirName); char *dirName);
@ -1355,7 +1355,7 @@ parseArgs(int argc, char *argv[])
} }
static char * static char *
parseDocument(Boolean runCmd, ...) parseDocument(int runCmd, ...)
{ {
va_list ap; va_list ap;
char *ptr; char *ptr;

1
cde/programs/dtlogin/vgmain.c
View file

@ -2222,7 +2222,6 @@ DebugWidgetResources(Widget w)
XtGetValues(w, argt, i); XtGetValues(w, argt, i);
} }
/*
/*************************************************************************** /***************************************************************************
* *
* GetDisplayName (void) - transform the display name into a "short" * GetDisplayName (void) - transform the display name into a "short"

2
cde/programs/dtprintinfo/Imakefile
View file

@ -1,7 +1,7 @@
XCOMM $TOG: Imakefile /main/21 1998/08/25 12:58:41 mgreess $ XCOMM $TOG: Imakefile /main/21 1998/08/25 12:58:41 mgreess $
#define CplusplusSource YES #define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB) EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#define IHaveSubdirs #define IHaveSubdirs

2
cde/programs/dtprintinfo/UI/Imakefile
View file

@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/04/21 19:50:41 drk $
#define LibInstall NO #define LibInstall NO
#define CplusplusSource YES #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 INCLUDES = -I. -I.. -I../libUI -I../libUI/MotifUI -I../objects -I../util -I../objects -I../objects/PrintObj

2
cde/programs/dtprintinfo/libUI/Imakefile
View file

@ -1,7 +1,7 @@
XCOMM $TOG: Imakefile /main/14 1998/08/25 12:59:12 mgreess $ XCOMM $TOG: Imakefile /main/14 1998/08/25 12:59:12 mgreess $
#define CplusplusSource YES #define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB) EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#define IHaveSubdirs #define IHaveSubdirs

2
cde/programs/dtprintinfo/objects/PrintObj/Imakefile
View file

@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:52:17 drk $
#define LibInstall NO #define LibInstall NO
#define CplusplusSource YES #define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
INCLUDES = -I. -I.. -I../.. -I../../util INCLUDES = -I. -I.. -I../.. -I../../util

2
cde/programs/dtprintinfo/util/Imakefile
View file

@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:50:47 drk $
#define LibInstall NO #define LibInstall NO
#define CplusplusSource YES #define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
INCLUDES = -I. INCLUDES = -I.

2
cde/programs/dtsearchpath/dtsp/InfoLibSearchPath.C
View file

@ -20,7 +20,7 @@
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA * 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 Digital Equipment Corporation.
* (c) Copyright 1996 Hewlett-Packard Company. * (c) Copyright 1996 Hewlett-Packard Company.

2
cde/programs/dtstyle/ColorFile.c
View file

@ -50,7 +50,7 @@
#ifdef __hpux #ifdef __hpux
#include <ndir.h> /* opendir(), directory(3C) */ #include <ndir.h> /* opendir(), directory(3C) */
#else #else
#if SVR4 || sco #if defined(SVR4) || defined(sco) || defined(CSRG_BASED)
#include <dirent.h> /* opendir(), directory(3C) */ #include <dirent.h> /* opendir(), directory(3C) */
#else #else
#include <sys/dir.h> #include <sys/dir.h>

3
cde/programs/dtudcfonted/libfal/include/os.h
View file

@ -99,6 +99,9 @@ pragma on(alloca);
#if defined(__GNUC__) #if defined(__GNUC__)
#if !defined(__linux__) #if !defined(__linux__)
#ifdef alloca
#undef alloca
#endif
#define alloca ___builtin_alloca #define alloca ___builtin_alloca
#endif #endif
#define ALLOCATE_LOCAL(size) alloca((int)(size)) #define ALLOCATE_LOCAL(size) alloca((int)(size))

2
cde/programs/ttsnoop/Imakefile
View file

@ -5,7 +5,7 @@ UTILLIB = -lutil
#endif /* BSDArchitecture */ #endif /* BSDArchitecture */
#define CplusplusSource YES #define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
INCLUDES = $(TIRPCINC) INCLUDES = $(TIRPCINC)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB) EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)