summaryrefslogtreecommitdiffstats
path: root/soltools/cpp
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 04:06:54 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 04:06:54 +0000
commitc3839ed91d149142b87ce48e06f4678e248cc25d (patch)
treec8eb90ed7491bf8ca6a2b2db79c6618de41df02c /soltools/cpp
parentINTEGRATION: CWS warnings01 (1.1.146); FILE MERGED (diff)
downloadcore-c3839ed91d149142b87ce48e06f4678e248cc25d.tar.gz
core-c3839ed91d149142b87ce48e06f4678e248cc25d.zip
INTEGRATION: CWS warnings01 (1.2.42); FILE MERGED
2005/11/21 16:22:21 sb 1.2.42.3: #i53898# Avoid non-ASCII characters in comments. 2005/11/07 12:08:32 sb 1.2.42.2: #i53898# Made code warning-free (additional -W switches for GCC). 2005/09/02 14:57:34 sb 1.2.42.1: #i53898# Made code warning-free.
Diffstat (limited to 'soltools/cpp')
-rw-r--r--soltools/cpp/_nlist.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c
index 5441dce3eeeb..ad9ce9ae5a63 100644
--- a/soltools/cpp/_nlist.c
+++ b/soltools/cpp/_nlist.c
@@ -15,7 +15,7 @@ char wd[128];
der Verkettung gibt, irgendwann irgendwo wird mal ein nlist->next
ueberschrieben, was in eineme SIGSEGV resultiert.
Den GDB mit watchpoint hab ich aber nach 2 Tagen abgebrochen..
- so loeppt´s jedenfalls erstmal..
+ so loeppt's jedenfalls erstmal..
*/
#define NLSIZE 15000
@@ -52,11 +52,10 @@ struct kwtab
{"__DATE__", KDATE, ISMAC + ISUNCHANGE},
{"__TIME__", KTIME, ISMAC + ISUNCHANGE},
{"__STDC__", KSTDC, ISUNCHANGE},
- {NULL}
+ {NULL, 0, 0}
};
unsigned long namebit[077 + 1];
-Nlist *np;
void
setup_kwtab(void)
@@ -64,7 +63,7 @@ void
struct kwtab *kp;
Nlist *np;
Token t;
- static Token deftoken[1] = {{NAME, 0, 0, 7, (uchar *) "defined"}};
+ static Token deftoken[1] = {{NAME, 0, 0, 7, (uchar *) "defined", 0}};
static Tokenrow deftr = {deftoken, deftoken, deftoken + 1, 1};
for (kp = kwtab; kp->kw; kp++)
@@ -72,8 +71,8 @@ void
t.t = (uchar *) kp->kw;
t.len = strlen(kp->kw);
np = lookup(&t, 1);
- np->flag = kp->flag;
- np->val = kp->val;
+ np->flag = (char) kp->flag;
+ np->val = (char) kp->val;
if (np->val == KDEFINED)
{
kwdefined = np;