diff options
| author | Rob Landley <rob@landley.net> | 2006-03-10 19:22:06 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-03-10 19:22:06 +0000 |
| commit | bc68cd14ccaebc17e7e03a08e51fddfb91007624 (patch) | |
| tree | beb32cedafc6232bf8a49fe90f0769d471ea6791 /console-tools | |
| parent | dae6aa28598cb2353291f18ca52e768c3259165a (diff) | |
| download | busybox-w32-bc68cd14ccaebc17e7e03a08e51fddfb91007624.tar.gz busybox-w32-bc68cd14ccaebc17e7e03a08e51fddfb91007624.tar.bz2 busybox-w32-bc68cd14ccaebc17e7e03a08e51fddfb91007624.zip | |
Patch from Denis Vlasenko turning static const int (which gets emitted into
the busybox binary) into enums (which don't).
Diffstat (limited to 'console-tools')
| -rw-r--r-- | console-tools/chvt.c | 6 | ||||
| -rw-r--r-- | console-tools/deallocvt.c | 2 | ||||
| -rw-r--r-- | console-tools/loadfont.c | 16 | ||||
| -rw-r--r-- | console-tools/setkeycodes.c | 4 |
4 files changed, 17 insertions, 11 deletions
diff --git a/console-tools/chvt.c b/console-tools/chvt.c index b1a429eb3..252aed740 100644 --- a/console-tools/chvt.c +++ b/console-tools/chvt.c | |||
| @@ -29,8 +29,10 @@ | |||
| 29 | #include "busybox.h" | 29 | #include "busybox.h" |
| 30 | 30 | ||
| 31 | /* From <linux/vt.h> */ | 31 | /* From <linux/vt.h> */ |
| 32 | static const int VT_ACTIVATE = 0x5606; /* make vt active */ | 32 | enum { |
| 33 | static const int VT_WAITACTIVE = 0x5607; /* wait for vt active */ | 33 | VT_ACTIVATE = 0x5606, /* make vt active */ |
| 34 | VT_WAITACTIVE = 0x5607 /* wait for vt active */ | ||
| 35 | }; | ||
| 34 | 36 | ||
| 35 | int chvt_main(int argc, char **argv) | 37 | int chvt_main(int argc, char **argv) |
| 36 | { | 38 | { |
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c index 00ddf4236..ad3cebfef 100644 --- a/console-tools/deallocvt.c +++ b/console-tools/deallocvt.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include "busybox.h" | 30 | #include "busybox.h" |
| 31 | 31 | ||
| 32 | /* From <linux/vt.h> */ | 32 | /* From <linux/vt.h> */ |
| 33 | static const int VT_DISALLOCATE = 0x5608; /* free memory associated to vt */ | 33 | enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */ |
| 34 | 34 | ||
| 35 | int deallocvt_main(int argc, char *argv[]) | 35 | int deallocvt_main(int argc, char *argv[]) |
| 36 | { | 36 | { |
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index 31c6d2495..31221e080 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c | |||
| @@ -21,13 +21,15 @@ | |||
| 21 | #include <endian.h> | 21 | #include <endian.h> |
| 22 | #include "busybox.h" | 22 | #include "busybox.h" |
| 23 | 23 | ||
| 24 | static const int PSF_MAGIC1 = 0x36; | 24 | enum{ |
| 25 | static const int PSF_MAGIC2 = 0x04; | 25 | PSF_MAGIC1 = 0x36, |
| 26 | 26 | PSF_MAGIC2 = 0x04, | |
| 27 | static const int PSF_MODE512 = 0x01; | 27 | |
| 28 | static const int PSF_MODEHASTAB = 0x02; | 28 | PSF_MODE512 = 0x01, |
| 29 | static const int PSF_MAXMODE = 0x03; | 29 | PSF_MODEHASTAB = 0x02, |
| 30 | static const int PSF_SEPARATOR = 0xFFFF; | 30 | PSF_MAXMODE = 0x03, |
| 31 | PSF_SEPARATOR = 0xFFFF | ||
| 32 | }; | ||
| 31 | 33 | ||
| 32 | struct psf_header { | 34 | struct psf_header { |
| 33 | unsigned char magic1, magic2; /* Magic number */ | 35 | unsigned char magic1, magic2; /* Magic number */ |
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c index efb6e658f..dacf37b12 100644 --- a/console-tools/setkeycodes.c +++ b/console-tools/setkeycodes.c | |||
| @@ -33,7 +33,9 @@ | |||
| 33 | struct kbkeycode { | 33 | struct kbkeycode { |
| 34 | unsigned int scancode, keycode; | 34 | unsigned int scancode, keycode; |
| 35 | }; | 35 | }; |
| 36 | static const int KDSETKEYCODE = 0x4B4D; /* write kernel keycode table entry */ | 36 | enum { |
| 37 | KDSETKEYCODE = 0x4B4D /* write kernel keycode table entry */ | ||
| 38 | }; | ||
| 37 | 39 | ||
| 38 | extern int | 40 | extern int |
| 39 | setkeycodes_main(int argc, char** argv) | 41 | setkeycodes_main(int argc, char** argv) |