summaryrefslogtreecommitdiff
path: root/idlc/source/preproc/nlist.c
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 02:51:46 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 02:51:46 +0000
commitdbe5b6b631253183d52c59f5bcbebba956327a19 (patch)
tree6e5d33d7b9183fea7be8b27897279a33d91137a2 /idlc/source/preproc/nlist.c
parent6451dcf83b6dc30002979724f6a29f3d15486beb (diff)
INTEGRATION: CWS warnings01 (1.1.148); FILE MERGED
2005/11/21 16:28:41 sb 1.1.148.4: #i53898# Made code warning-free. 2005/11/08 16:34:40 pl 1.1.148.3: #i53898# removed warnings 2005/09/23 00:08:34 sb 1.1.148.2: RESYNC: (1.1-1.2); FILE MERGED 2005/08/29 14:14:28 sb 1.1.148.1: #i53898# Made code warning-free.
Diffstat (limited to 'idlc/source/preproc/nlist.c')
-rw-r--r--idlc/source/preproc/nlist.c59
1 files changed, 29 insertions, 30 deletions
diff --git a/idlc/source/preproc/nlist.c b/idlc/source/preproc/nlist.c
index 8c01313b451d..a672e03afff1 100644
--- a/idlc/source/preproc/nlist.c
+++ b/idlc/source/preproc/nlist.c
@@ -4,9 +4,9 @@
*
* $RCSfile: nlist.c,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 18:15:55 $
+ * last change: $Author: hr $ $Date: 2006-06-20 03:51:46 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -49,7 +49,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 loeppts jedenfalls erstmal..
+ so loeppt's jedenfalls erstmal..
*/
#define NLSIZE 15000
@@ -63,34 +63,33 @@ struct kwtab
} kwtab[] =
{
- "if", KIF, ISKW,
- "ifdef", KIFDEF, ISKW,
- "ifndef", KIFNDEF, ISKW,
- "elif", KELIF, ISKW,
- "else", KELSE, ISKW,
- "endif", KENDIF, ISKW,
- "include", KINCLUDE, ISKW,
- "include_next", KINCLUDENEXT, ISKW,
- "import", KIMPORT, ISKW,
- "define", KDEFINE, ISKW,
- "undef", KUNDEF, ISKW,
- "line", KLINE, ISKW,
- "error", KERROR, ISKW,
- "pragma", KPRAGMA, ISKW,
- "ident", KIDENT, ISKW,
- "eval", KEVAL, ISKW,
- "defined", KDEFINED, ISDEFINED + ISUNCHANGE,
- "machine", KMACHINE, ISDEFINED + ISUNCHANGE,
- "__LINE__", KLINENO, ISMAC + ISUNCHANGE,
- "__FILE__", KFILE, ISMAC + ISUNCHANGE,
- "__DATE__", KDATE, ISMAC + ISUNCHANGE,
- "__TIME__", KTIME, ISMAC + ISUNCHANGE,
- "__STDC__", KSTDC, ISUNCHANGE,
- NULL
+ { "if", KIF, ISKW },
+ { "ifdef", KIFDEF, ISKW },
+ { "ifndef", KIFNDEF, ISKW },
+ { "elif", KELIF, ISKW },
+ { "else", KELSE, ISKW },
+ { "endif", KENDIF, ISKW },
+ { "include", KINCLUDE, ISKW },
+ { "include_next", KINCLUDENEXT, ISKW },
+ { "import", KIMPORT, ISKW },
+ { "define", KDEFINE, ISKW },
+ { "undef", KUNDEF, ISKW },
+ { "line", KLINE, ISKW },
+ { "error", KERROR, ISKW },
+ { "pragma", KPRAGMA, ISKW },
+ { "ident", KIDENT, ISKW },
+ { "eval", KEVAL, ISKW },
+ { "defined", KDEFINED, ISDEFINED + ISUNCHANGE },
+ { "machine", KMACHINE, ISDEFINED + ISUNCHANGE },
+ { "__LINE__", KLINENO, ISMAC + ISUNCHANGE },
+ { "__FILE__", KFILE, ISMAC + ISUNCHANGE },
+ { "__DATE__", KDATE, ISMAC + ISUNCHANGE },
+ { "__TIME__", KTIME, ISMAC + ISUNCHANGE },
+ { "__STDC__", KSTDC, ISUNCHANGE },
+ { NULL, 0, 0 }
};
unsigned long namebit[077 + 1];
-Nlist *np;
void
setup_kwtab(void)
@@ -106,8 +105,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;