diff options
| author | scottmc <scottmc> | 2010-06-04 01:42:54 (GMT) |
|---|---|---|
| committer | scottmc <scottmc> | 2010-06-04 01:42:54 (GMT) |
| commit | 020f528509332c2282f07bf2112f38e46437b1d1 (patch) | |
| tree | 65b547ebb4bbfbe456e4a84b4032946332fe09dd | |
| parent | daa1c41d5a282a08720e8c19f3e0ea6158256ff5 (diff) | |
Fixes for parse.gperf on gcc2 Haiku build (perhaps others?).
| -rw-r--r-- | src/parse.gperf | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/parse.gperf b/src/parse.gperf index 9cc9bf3..6c4e71e 100644 --- a/src/parse.gperf +++ b/src/parse.gperf @@ -157,6 +157,13 @@ windowsize, MULTI(parsertmp_windowsize) void parse_one_option(struct cfginfo *restrict tmpcfg, const char *str, const char *opt, const char *restrict src) { + int noflag; + uintptr_t uintptr; + unsigned flags; + unsigned offset; + char *dupecheck; + const struct cfg *cfg; + //printf("parsing: <%s> <%s>\n",str,arg); if(isdigit(*str)) @@ -167,11 +174,11 @@ void parse_one_option(struct cfginfo *restrict tmpcfg, const char *str, const ch str = "windowsize"; } - int noflag = 2*(str[0]=='n' && str[1]=='o' && str[2]); - const struct cfg *cfg = in_word_set(str+noflag, strlen(str+noflag)); + noflag = 2*(str[0]=='n' && str[1]=='o' && str[2]); + cfg = in_word_set(str+noflag, strlen(str+noflag)); - uintptr_t uintptr = cfg ? (uintptr_t)cfg->val : 0; - unsigned flags = (uintptr<CFGINFO_MAXOFFSET) ? (uintptr & FLAGMASK) : 0; + uintptr = cfg ? (uintptr_t)cfg->val : 0; + flags = (uintptr<CFGINFO_MAXOFFSET) ? (uintptr & FLAGMASK) : 0; if(!cfg || (!(flags & BOOLMASK) && noflag) ) { @@ -226,9 +233,8 @@ void parse_one_option(struct cfginfo *restrict tmpcfg, const char *str, const ch exit(52); } - unsigned offset = uintptr &~ FLAGMASK; + offset = uintptr &~ FLAGMASK; - char *dupecheck; memcpy(&dupecheck, offset+(char*)tmpcfg, sizeof(char*)); if(dupecheck) { |