diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-13 21:05:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-13 21:05:03 +0000 |
| commit | 1d7939dc8581f0ad515d31df28cc40ab98c111a4 (patch) | |
| tree | a866c836aa67daf40307cb3e4d9b77fa1dd94264 /soltools | |
| parent | 250579bcc18825c6b59ff04972ff7d8c36224e99 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes53
2009-03-13 14:38:36 +0100 cmc r269480 : gcc44 problems
2009-01-07 14:40:49 +0100 cmc r265968 : #i97835# remove some long-hanging unused methods
2009-01-07 14:16:47 +0100 cmc r265966 : #i97833# DDE_AVAILABLE is always false in binfilter
2009-01-07 14:06:40 +0100 cmc r265965 : #i97831# DDE_AVAILABLE is always true so remove the ifdefs to de-clutter the code
Diffstat (limited to 'soltools')
| -rw-r--r-- | soltools/mkdepend/def.h | 2 | ||||
| -rw-r--r-- | soltools/mkdepend/main.c | 2 | ||||
| -rw-r--r-- | soltools/mkdepend/parse.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h index f7d931cdde91..9da82495f024 100644 --- a/soltools/mkdepend/def.h +++ b/soltools/mkdepend/def.h @@ -154,7 +154,7 @@ char *realloc(); char *copy(); char *base_name(); -char *getline(); +char *get_line(); char *isdefined(); struct filepointer *getfile(); struct inclist *newinclude(); diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index 082feb90448e..de5b66256d1e 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -548,7 +548,7 @@ int match(str, list) * Get the next line. We only return lines beginning with '#' since that * is all this program is ever interested in. */ -char *getline(filep) +char *get_line(filep) register struct filepointer *filep; { register char *p, /* walking pointer */ diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c index 58ceadab0387..b98cfce5b6a8 100644 --- a/soltools/mkdepend/parse.c +++ b/soltools/mkdepend/parse.c @@ -45,7 +45,7 @@ int find_includes(filep, file, file_red, recursion, failOK, incCollection, symbo register int type; boolean recfailOK; - while ((line = getline(filep))) { + while ((line = get_line(filep))) { switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) { case IF: doif: @@ -168,7 +168,7 @@ int gobble(filep, file, file_red, symbols) register char *line; register int type; - while ((line = getline(filep))) { + while ((line = get_line(filep))) { switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) { case IF: case IFFALSE: |