aboutsummaryrefslogtreecommitdiff
path: root/console-tools
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-03-10 19:22:06 +0000
committerGravatar Rob Landley <rob@landley.net>2006-03-10 19:22:06 +0000
commitbc68cd14ccaebc17e7e03a08e51fddfb91007624 (patch)
treebeb32cedafc6232bf8a49fe90f0769d471ea6791 /console-tools
parentdae6aa28598cb2353291f18ca52e768c3259165a (diff)
downloadbusybox-bc68cd14ccaebc17e7e03a08e51fddfb91007624.tar.gz
busybox-bc68cd14ccaebc17e7e03a08e51fddfb91007624.tar.bz2
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.c6
-rw-r--r--console-tools/deallocvt.c2
-rw-r--r--console-tools/loadfont.c16
-rw-r--r--console-tools/setkeycodes.c4
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 @@
#include "busybox.h"
/* From <linux/vt.h> */
-static const int VT_ACTIVATE = 0x5606; /* make vt active */
-static const int VT_WAITACTIVE = 0x5607; /* wait for vt active */
+enum {
+ VT_ACTIVATE = 0x5606, /* make vt active */
+ VT_WAITACTIVE = 0x5607 /* wait for vt active */
+};
int chvt_main(int argc, char **argv)
{
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 @@
#include "busybox.h"
/* From <linux/vt.h> */
-static const int VT_DISALLOCATE = 0x5608; /* free memory associated to vt */
+enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */
int deallocvt_main(int argc, char *argv[])
{
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 @@
#include <endian.h>
#include "busybox.h"
-static const int PSF_MAGIC1 = 0x36;
-static const int PSF_MAGIC2 = 0x04;
-
-static const int PSF_MODE512 = 0x01;
-static const int PSF_MODEHASTAB = 0x02;
-static const int PSF_MAXMODE = 0x03;
-static const int PSF_SEPARATOR = 0xFFFF;
+enum{
+ PSF_MAGIC1 = 0x36,
+ PSF_MAGIC2 = 0x04,
+
+ PSF_MODE512 = 0x01,
+ PSF_MODEHASTAB = 0x02,
+ PSF_MAXMODE = 0x03,
+ PSF_SEPARATOR = 0xFFFF
+};
struct psf_header {
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 @@
struct kbkeycode {
unsigned int scancode, keycode;
};
-static const int KDSETKEYCODE = 0x4B4D; /* write kernel keycode table entry */
+enum {
+ KDSETKEYCODE = 0x4B4D /* write kernel keycode table entry */
+};
extern int
setkeycodes_main(int argc, char** argv)