diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-01-24 16:25:34 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-01-24 16:25:34 -0800 |
| commit | 95e6215b6f1d31eebdb1ddeb4c13007c5af30c23 (patch) | |
| tree | 5dbce6408bb350b242e5c4dd592da103ed6cfb86 /com32/rosh | |
| parent | 8f189531a58aef0655cd04a620931da3a0157eaa (diff) | |
| parent | 1da816e5101d61edc8a01e3c76a1b89933a8b863 (diff) | |
| download | syslinux-95e6215b6f1d31eebdb1ddeb4c13007c5af30c23.tar.gz | |
Merge branch 'master' into fsc
Conflicts:
com32/lib/MCONFIG
com32/lib/readdir.c
Diffstat (limited to 'com32/rosh')
| -rw-r--r-- | com32/rosh/MCONFIG | 4 | ||||
| -rw-r--r-- | com32/rosh/rosh.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/com32/rosh/MCONFIG b/com32/rosh/MCONFIG index 30029d15..25c41396 100644 --- a/com32/rosh/MCONFIG +++ b/com32/rosh/MCONFIG @@ -17,11 +17,11 @@ ## Include the COM32 common configurables include ../MCONFIG -# CFLAGS = $(GCCOPT) -W -Wall -march=i386 \ +# CFLAGS = $(GCCOPT) $(GCCWARN) -march=i386 \ # -fomit-frame-pointer -D__COM32__ \ # -nostdinc -iwithprefix include \ # -I$(com32)/libutil/include -I$(com32)/include # -g3 -dD -# LNXCFLAGS = -I$(com32)/libutil/include -W -Wall -O -g3 -D_GNU_SOURCE -dD +# LNXCFLAGS = -I$(com32)/libutil/include $(GCCWARN) -O -g3 -D_GNU_SOURCE -dD # -U__GNUC__ diff --git a/com32/rosh/rosh.c b/com32/rosh/rosh.c index 2221bb0a..13e8ffbd 100644 --- a/com32/rosh/rosh.c +++ b/com32/rosh/rosh.c @@ -37,7 +37,7 @@ #define APP_YEAR "2008" #define APP_VER "beta-b032" -void rosh_version() +void rosh_version(void) { printf("%s v %s; (c) %s %s.\n", APP_LONGNAME, APP_VER, APP_YEAR, APP_AUTHOR); @@ -224,7 +224,7 @@ void rosh_print_tc(struct termios *tio) * Switches console over to raw input mode. Allows get_key to get just * 1 key sequence (without delay or display) */ -void rosh_console_raw() +void rosh_console_raw(void) { // struct termios itio, ntio; // tcgetattr(0, &itio); @@ -241,7 +241,7 @@ void rosh_console_raw() /* * Switches back to standard getline mode. */ -void rosh_console_std() +void rosh_console_std(void) { // struct termios itio, ntio; console_ansi_std(); @@ -252,7 +252,7 @@ void rosh_console_std() * Attempts to get a single key from the console * returns key pressed */ -int rosh_getkey() +int rosh_getkey(void) { int inc; |