svn commit: trunk/busybox: shell util-linux
vda at busybox.net
vda at busybox.net
Tue Jul 29 11:10:01 UTC 2008
Author: vda
Date: 2008-07-29 04:10:01 -0700 (Tue, 29 Jul 2008)
New Revision: 22980
Log:
randomconfig fixes
Modified:
trunk/busybox/shell/hush.c
trunk/busybox/util-linux/fbset.c
Changeset:
Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c 2008-07-29 10:16:05 UTC (rev 22979)
+++ trunk/busybox/shell/hush.c 2008-07-29 11:10:01 UTC (rev 22980)
@@ -217,7 +217,7 @@
/* 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 @@
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 @@
[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 @@
#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, };
Modified: trunk/busybox/util-linux/fbset.c
===================================================================
--- trunk/busybox/util-linux/fbset.c 2008-07-29 10:16:05 UTC (rev 22979)
+++ trunk/busybox/util-linux/fbset.c 2008-07-29 11:10:01 UTC (rev 22980)
@@ -170,6 +170,7 @@
};
#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 @@
*x |= flag;
}
-#if ENABLE_FEATURE_FBSET_READMODE
static int readmode(struct fb_var_screeninfo *base, const char *fn,
const char *mode)
{
More information about the busybox-cvs
mailing list