emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/#ifdef CONFIG_/#if ENABLE_/g

Browse Source
This commit is contained in:
Denis Vlasenko
2007-08-13 10:36:25 +00:00
parent 5f1b149d54
commit e324184c05
22 changed files with 60 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
util-linux/fbset.c
View File

@ -37,7 +37,7 @@ enum {
CMD_INFO = 12,
CMD_CHANGE = 13,
#ifdef CONFIG_FEATURE_FBSET_FANCY
#if ENABLE_FEATURE_FBSET_FANCY
CMD_XRES = 100,
CMD_YRES = 101,
CMD_VXRES = 102,
@ -130,7 +130,7 @@ static const struct cmdoptions_t {
{ "-laced", 1, CMD_LACED },
{ "-double", 1, CMD_DOUBLE },
{ "-n", 0, CMD_CHANGE },
#ifdef CONFIG_FEATURE_FBSET_FANCY
#if ENABLE_FEATURE_FBSET_FANCY
{ "-all", 0, CMD_ALL },
{ "-xres", 1, CMD_XRES },
{ "-yres", 1, CMD_YRES },
@ -158,7 +158,7 @@ static const struct cmdoptions_t {
{ "", 0, 0 }
};
#ifdef CONFIG_FEATURE_FBSET_READMODE
#if ENABLE_FEATURE_FBSET_READMODE
/* taken from linux/fb.h */
enum {
FB_VMODE_INTERLACED = 1, /* interlaced */
@ -173,7 +173,7 @@ enum {
static int readmode(struct fb_var_screeninfo *base, const char *fn,
const char *mode)
{
#ifdef CONFIG_FEATURE_FBSET_READMODE
#if ENABLE_FEATURE_FBSET_READMODE
FILE *f;
char buf[256];
char *p = buf;
@ -286,7 +286,7 @@ static inline void showmode(struct fb_var_screeninfo *v)
vrate = hrate / (v->upper_margin + v->yres + v->lower_margin + v->vsync_len);
}
printf("\nmode \"%ux%u-%u\"\n"
#ifdef CONFIG_FEATURE_FBSET_FANCY
#if ENABLE_FEATURE_FBSET_FANCY
"\t# D: %.3f MHz, H: %.3f kHz, V: %.3f Hz\n"
#endif
"\tgeometry %u %u %u %u %u\n"
@ -295,7 +295,7 @@ static inline void showmode(struct fb_var_screeninfo *v)
"\trgba %u/%u,%u/%u,%u/%u,%u/%u\n"
"endmode\n\n",
v->xres, v->yres, (int) (vrate + 0.5),
#ifdef CONFIG_FEATURE_FBSET_FANCY
#if ENABLE_FEATURE_FBSET_FANCY
drate / 1e6, hrate / 1e3, vrate,
#endif
v->xres, v->yres, v->xres_virtual, v->yres_virtual, v->bits_per_pixel,
@ -360,7 +360,7 @@ int fbset_main(int argc, char **argv)
case CMD_CHANGE:
g_options |= OPT_CHANGE;
break;
#ifdef CONFIG_FEATURE_FBSET_FANCY
#if ENABLE_FEATURE_FBSET_FANCY
case CMD_XRES:
varset.xres = xatou32(argv[1]);
break;

2
util-linux/hwclock.c
View File

@ -132,7 +132,7 @@ static void from_sys_clock(int utc)
write_rtc(tv.tv_sec, utc);
}
#ifdef CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS
# define ADJTIME_PATH "/var/lib/hwclock/adjtime"
#else
# define ADJTIME_PATH "/etc/adjtime"

11
util-linux/ipcrm.c
View File

@ -29,7 +29,10 @@ union semun {
};
#endif
#ifndef CONFIG_IPCRM_DROP_LEGACY
#define IPCRM_LEGACY 1
#if IPCRM_LEGACY
typedef enum type_id {
SHM,
@ -70,7 +73,7 @@ static int remove_ids(type_id type, int argc, char **argv)
return nb_errors;
}
#endif /* #ifndef CONFIG_IPCRM_DROP_LEGACY */
#endif /* IPCRM_LEGACY */
int ipcrm_main(int argc, char **argv);
@ -82,7 +85,7 @@ int ipcrm_main(int argc, char **argv)
/* if the command is executed without parameters, do nothing */
if (argc == 1)
return 0;
#ifndef CONFIG_IPCRM_DROP_LEGACY
#if IPCRM_LEGACY
/* check to see if the command is being invoked in the old way if so
then run the old code. Valid commands are msg, shm, sem. */
{
@ -113,7 +116,7 @@ int ipcrm_main(int argc, char **argv)
return 0;
}
}
#endif /* #ifndef CONFIG_IPCRM_DROP_LEGACY */
#endif /* IPCRM_LEGACY */
/* process new syntax to conform with SYSV ipcrm */
while ((c = getopt(argc, argv, "q:m:s:Q:M:S:h?")) != -1) {