From f8f786bbc97a91f85a721d72d04cb85cdcfda8da Mon Sep 17 00:00:00 2001 From: deuce <> Date: Mon, 6 Jun 2005 23:00:46 +0000 Subject: [PATCH] Fix Intel CC warnings. --- src/conio/ciolib.c | 2 +- src/conio/console.c | 7 +++++-- src/conio/console.h | 1 + src/conio/cterm.c | 1 + src/conio/curs_cio.c | 2 ++ src/conio/mouse.c | 2 +- src/conio/x_cio.c | 3 +++ src/conio/x_cio.h | 1 + 8 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/conio/ciolib.c b/src/conio/ciolib.c index 142cad604f..9f4ac3545b 100644 --- a/src/conio/ciolib.c +++ b/src/conio/ciolib.c @@ -553,7 +553,7 @@ void ciolib_gotoxy(int x, int y) cio_api.gotoxy(nx,ny); } -void ciolib_textmode(mode) +void ciolib_textmode(int mode) { CIOLIB_INIT(); diff --git a/src/conio/console.c b/src/conio/console.c index 2c7a6d65ec..593dcc2493 100644 --- a/src/conio/console.c +++ b/src/conio/console.c @@ -109,6 +109,7 @@ #define CONSOLE_CLIPBOARD XA_PRIMARY +#include <threadwrap.h> #include <genwrap.h> #include "console.h" @@ -377,6 +378,8 @@ struct { #define HWM 16 void resize_window(void); +int KbdEmpty(void); +int load_font(char *filename, int width, int height, int scale); void tty_pause() { @@ -513,7 +516,7 @@ void video_update() { static clock_t lastupd=-1; - static clock_started=0; + static int clock_started=0; clock_t upd; upd=msclock(); @@ -1671,7 +1674,7 @@ KbdRead() } int -KbdEmpty() +KbdEmpty(void) { return(K_NEXT == K_FREE); } diff --git a/src/conio/console.h b/src/conio/console.h index 2a2fb21be7..c15a0a73a3 100644 --- a/src/conio/console.h +++ b/src/conio/console.h @@ -82,6 +82,7 @@ int tty_peek(int flag); int tty_kbhit(void); void tty_beep(void); void x_win_title(const char *title); +int console_init(void); #define TTYF_BLOCK 0x00000008 #define TTYF_POLL 0x00000010 diff --git a/src/conio/cterm.c b/src/conio/cterm.c index e9f71dc2e9..678159dc2b 100644 --- a/src/conio/cterm.c +++ b/src/conio/cterm.c @@ -31,6 +31,7 @@ * Note: If this box doesn't appear square, then you need to fix your tabs. * ****************************************************************************/ +#include <ctype.h> #include <stdlib.h> #include <string.h> diff --git a/src/conio/curs_cio.c b/src/conio/curs_cio.c index e90ea84c8f..96f99039f7 100644 --- a/src/conio/curs_cio.c +++ b/src/conio/curs_cio.c @@ -1125,6 +1125,7 @@ int curs_hidemouse(void) return(-1); #endif */ + return(-1); } int curs_showmouse(void) @@ -1136,4 +1137,5 @@ int curs_showmouse(void) #endif return(-1); */ + return(-1); } diff --git a/src/conio/mouse.c b/src/conio/mouse.c index eafba149e9..897743950e 100644 --- a/src/conio/mouse.c +++ b/src/conio/mouse.c @@ -97,7 +97,7 @@ struct mouse_state { struct mouse_state state; int mouse_events=0; -static mouse_initialized=0; +static int mouse_initialized=0; void init_mouse(void) { diff --git a/src/conio/x_cio.c b/src/conio/x_cio.c index 51686745a7..8f20295ea4 100644 --- a/src/conio/x_cio.c +++ b/src/conio/x_cio.c @@ -33,6 +33,7 @@ #include <stdarg.h> #include <stdio.h> +#include <unistd.h> #include <threadwrap.h> @@ -73,6 +74,7 @@ int x_puttext(int sx, int sy, int ex, int ey, void *fill) vmem[y*DpyCols+x]=sch; } } + return(1); } int x_gettext(int sx, int sy, int ex, int ey, void *fill) @@ -105,6 +107,7 @@ int x_gettext(int sx, int sy, int ex, int ey, void *fill) *(out++)=sch >> 8; } } + return(1); } void x_textattr(int attr) diff --git a/src/conio/x_cio.h b/src/conio/x_cio.h index ea19d1937d..b3692fdd3e 100644 --- a/src/conio/x_cio.h +++ b/src/conio/x_cio.h @@ -33,6 +33,7 @@ #ifdef __unix__ #include "ciolib.h" +#include "console.h" #ifdef __cplusplus extern "C" { -- GitLab