Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-05-28 21:41:30 +00:00
Code Issues Projects Releases Wiki Activity

randomconfig fixes

Browse Source
This commit is contained in:
Denis Vlasenko 2008-07-29 11:10:01 +00:00
parent dadfb4975b
commit d91afa33fd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shell/hush.c
View File

@ -217,7 +217,7 @@ void xxfree(void *ptr)
/* Keep unconditionally on for now */
#define HUSH_DEBUG 1
/* Do we support ANY keywords? */
#if ENABLE_HUSH_IF || ENABLE_HUSH_LOOPS
#if ENABLE_HUSH_IF || ENABLE_HUSH_LOOPS || ENABLE_HUSH_CASE
#define HAS_KEYWORDS 1
#define IF_HAS_KEYWORDS(...) __VA_ARGS__
#define IF_HAS_NO_KEYWORDS(...)
@ -276,6 +276,8 @@ typedef enum reserved_style {
RES_UNTIL ,
RES_DO ,
RES_DONE ,
#endif
#if ENABLE_HUSH_LOOPS || ENABLE_HUSH_CASE
RES_IN ,
#endif
#if ENABLE_HUSH_CASE
@ -1998,6 +2000,8 @@ static void debug_print_tree(struct pipe *pi, int lvl)
[RES_UNTIL] = "UNTIL",
[RES_DO ] = "DO" ,
[RES_DONE ] = "DONE" ,
#endif
#if ENABLE_HUSH_LOOPS || ENABLE_HUSH_CASE
[RES_IN ] = "IN" ,
#endif
#if ENABLE_HUSH_CASE
@ -2058,7 +2062,7 @@ static int run_list(struct pipe *pi)
#endif
smallint flag_skip = 1;
smalluint rcode = 0; /* probably just for compiler */
#if ENABLE_HUSH_IF
#if ENABLE_HUSH_IF || ENABLE_HUSH_CASE
smalluint cond_code = 0;
#else
enum { cond_code = 0, };

2
util-linux/fbset.c
View File

@ -170,6 +170,7 @@ enum {
};
#endif
#if ENABLE_FEATURE_FBSET_READMODE
static void ss(uint32_t *x, uint32_t flag, char *buf, const char *what)
{
if (strstr(buf, what))
@ -178,7 +179,6 @@ static void ss(uint32_t *x, uint32_t flag, char *buf, const char *what)
*x |= flag;
}
#if ENABLE_FEATURE_FBSET_READMODE
static int readmode(struct fb_var_screeninfo *base, const char *fn,
const char *mode)
{