projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EXEC_PREFER_APPLETS support by Gabriel L. Somlo <somlo@cmu.edu>
[oweals/busybox.git]
/
util-linux
/
fbset.c
diff --git
a/util-linux/fbset.c
b/util-linux/fbset.c
index 1aa0a0ac19330df3908da5caf8fffbca3db26c26..bd584e460cf2b64f5fbac604073a48ab3763a63a 100644
(file)
--- a/
util-linux/fbset.c
+++ b/
util-linux/fbset.c
@@
-61,7
+61,7
@@
enum {
#endif
};
#endif
};
-static unsigned
int g_options = 0
;
+static unsigned
g_options
;
/* Stuff stolen from the kernel's fb.h */
#define FB_ACTIVATE_ALL 64
/* Stuff stolen from the kernel's fb.h */
#define FB_ACTIVATE_ALL 64
@@
-309,13
+309,14
@@
static inline void showmode(struct fb_var_screeninfo *v)
#ifdef STANDALONE
int main(int argc, char **argv)
#else
#ifdef STANDALONE
int main(int argc, char **argv)
#else
+int fbset_main(int argc, char **argv);
int fbset_main(int argc, char **argv)
#endif
{
struct fb_var_screeninfo var, varset;
int fh, i;
int fbset_main(int argc, char **argv)
#endif
{
struct fb_var_screeninfo var, varset;
int fh, i;
- char *fbdev = DEFAULTFBDEV;
- char *modefile = DEFAULTFBMODE;
+ c
onst c
har *fbdev = DEFAULTFBDEV;
+ c
onst c
har *modefile = DEFAULTFBMODE;
char *thisarg, *mode = NULL;
memset(&varset, 0xFF, sizeof(varset));
char *thisarg, *mode = NULL;
memset(&varset, 0xFF, sizeof(varset));