diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-03-21 20:03:56 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-03-21 20:03:56 +0000 |
| commit | b35eb52e2ba8990192835e8544e7b1ab73634215 (patch) | |
| tree | a11383eeaa1b15b8030ca805706bbe04d03e683e /tools/lemon | |
| parent | 18da56319380ac420afe50bf0c92185c4dbb6df3 (diff) | |
Mimmicing lemon.c 1.36 exactly for Symbolcmpp does not make MSVC completly happy, see what FC4 says.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17692 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'tools/lemon')
| -rw-r--r-- | tools/lemon/lemon.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c index 1f3d211458..afe77d3667 100644 --- a/tools/lemon/lemon.c +++ b/tools/lemon/lemon.c @@ -345,7 +345,8 @@ char *Strsafe_find(const char *); /* Routines for handling symbols of the grammar */ struct symbol *Symbol_new(const char *x); -int Symbolcmpp(const void *, const void *); +/*int Symbolcmpp(const void *, const void *);*/ +int Symbolcmpp(struct symbol **, struct symbol **); void Symbol_init(void); int Symbol_insert(struct symbol *, char *); struct symbol *Symbol_find(const char *); @@ -1043,7 +1044,7 @@ void FindActions(struct lemon *lemp) static int resolve_conflict( struct action *apx, struct action *apy, - struct symbol *errsym) + struct symbol _U_ *errsym) { struct symbol *spx, *spy; int errcnt = 0; @@ -1521,7 +1522,8 @@ int main(int argc _U_, char **argv) Symbol_new("{default}"); lem.symbols = Symbol_arrayof(); for(i=0; i<=lem.nsymbol; i++) lem.symbols[i]->index = i; - qsort(lem.symbols,lem.nsymbol+1,sizeof(struct symbol*),Symbolcmpp); + qsort(lem.symbols,lem.nsymbol+1,sizeof(struct symbol*), + (int(*)())Symbolcmpp); for(i=0; i<=lem.nsymbol; i++) lem.symbols[i]->index = i; for(i=1; safe_isupper(lem.symbols[i]->name[0]); i++); lem.nterminal = i; |