diff options
author | bde <bde@FreeBSD.org> | 1997-04-20 16:38:22 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-04-20 16:38:22 +0000 |
commit | 2d072e5f9d207912f63db40b062677c0507dbed5 (patch) | |
tree | 6d83d2dd376c810b976b23a5441a3003276ab4e3 /sys/i386/isa/pcvt/pcvt_hdr.h | |
parent | 8784b3f4e891adb70e9eeb6b8e2a04741912409d (diff) | |
download | FreeBSD-src-2d072e5f9d207912f63db40b062677c0507dbed5.zip FreeBSD-src-2d072e5f9d207912f63db40b062677c0507dbed5.tar.gz |
Fixed the type of timeout functions and removed casts that hid the
type mismatches. There was no problem in practice (at least on 386's).
Don't cast NULL in calls to timeout functions. pcvt is fully prototyped
and doesn't support K&R.
Timeout functions take args of type `void *', so use magic numbers of
type `void *' for UPDATE_* to reduce the danger of wrong conversions.
Removed FreeBSD-pre-1.1-related TIMEOUT_FUNC_T macro. It was especially
bogus for the pre-1.1 case.
Diffstat (limited to 'sys/i386/isa/pcvt/pcvt_hdr.h')
-rw-r--r-- | sys/i386/isa/pcvt/pcvt_hdr.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h index b33ceba..533e588 100644 --- a/sys/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/i386/isa/pcvt/pcvt_hdr.h @@ -731,9 +731,9 @@ in the config file" /* arguments to async_update() */ -#define UPDATE_START 0 /* do cursor update and requeue */ -#define UPDATE_STOP 1 /* suspend cursor updates */ -#define UPDATE_KERN 2 /* do cursor updates for kernel output */ +#define UPDATE_START ((void *)0) /* do cursor update and requeue */ +#define UPDATE_STOP ((void *)1) /* suspend cursor updates */ +#define UPDATE_KERN ((void *)2) /* do cursor updates for kernel output */ /* variables */ @@ -1204,14 +1204,6 @@ extern u_char *saved_charsets[NVGAFONTS]; #define Dev_t dev_t #endif -/* in FreeBSD > 102 arguments for timeout()/untimeout() are a special type */ - -#if PCVT_FREEBSD > 102 -#define TIMEOUT_FUNC_T timeout_func_t -#else -#define TIMEOUT_FUNC_T void * -#endif - #if !PCVT_FREEBSD || (PCVT_FREEBSD < 210) extern void bcopyb(void *from, void *to, u_int length); #endif @@ -1267,7 +1259,7 @@ void pcvt_set_scrnsv_tmo ( int ); void vga_move_charset ( unsigned n, unsigned char *b, int save_it); -void async_update ( int arg ); +void async_update ( void *arg ); void clr_parms ( struct video_state *svsp ); void cons_highlight ( void ); void cons_normal ( void ); |