Remove some duplicate declarations in headers.
Explicitly declare some functions as returning void.
This commit is contained in:
parent
e0792d72d7
commit
fa3adedf63
@ -499,6 +499,7 @@ unsigned size;
|
|||||||
|
|
||||||
/* SBM_MFREE(sm) - Free up an allocated memory area.
|
/* SBM_MFREE(sm) - Free up an allocated memory area.
|
||||||
*/
|
*/
|
||||||
|
void
|
||||||
sbm_mfree(sm)
|
sbm_mfree(sm)
|
||||||
register struct smblk *sm;
|
register struct smblk *sm;
|
||||||
{ register struct smblk *smx;
|
{ register struct smblk *smx;
|
||||||
|
@ -32,7 +32,7 @@ _PROTOTYPE( struct smblk *sbm_lmak, (SBMA addr, SBMO elsize, int num) );
|
|||||||
_PROTOTYPE( int sbm_nmov, (struct smblk *smp1, struct smblk *smp2, struct smblk **begp, int elsize) );
|
_PROTOTYPE( int sbm_nmov, (struct smblk *smp1, struct smblk *smp2, struct smblk **begp, int elsize) );
|
||||||
_PROTOTYPE( struct smblk *sbm_mget, (SBMO cmin, SBMO cmax) );
|
_PROTOTYPE( struct smblk *sbm_mget, (SBMO cmin, SBMO cmax) );
|
||||||
_PROTOTYPE( char *sbm_brk, (unsigned size) );
|
_PROTOTYPE( char *sbm_brk, (unsigned size) );
|
||||||
_PROTOTYPE( int sbm_mfree, (struct smblk *sm) );
|
_PROTOTYPE( void sbm_mfree, (struct smblk *sm) );
|
||||||
_PROTOTYPE( struct smblk *sbm_exp, (struct smblk *sm, SBMO size) );
|
_PROTOTYPE( struct smblk *sbm_exp, (struct smblk *sm, SBMO size) );
|
||||||
_PROTOTYPE( int sbm_mmrg, (struct smblk *smp) );
|
_PROTOTYPE( int sbm_mmrg, (struct smblk *smp) );
|
||||||
_PROTOTYPE( struct smblk *sbm_split, (struct smblk *smp, SBMO coff) );
|
_PROTOTYPE( struct smblk *sbm_split, (struct smblk *smp, SBMO coff) );
|
||||||
|
@ -21,10 +21,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef UNUSED
|
#ifndef UNUSED
|
||||||
#if defined(__GNUC__)
|
#if defined _lint
|
||||||
|
# define UNUSED(v) /*lint -e(715,818)*/ v
|
||||||
|
#elif defined(__GNUC__)
|
||||||
# define UNUSED(v) UNUSED_ ## v __attribute((unused))
|
# define UNUSED(v) UNUSED_ ## v __attribute((unused))
|
||||||
#elif defined _lint
|
|
||||||
# define UNUSED(v) /*lint -e(715)*/ v
|
|
||||||
#elif defined __LCLINT__
|
#elif defined __LCLINT__
|
||||||
# define UNUSED(v) /*@unused@*/ v
|
# define UNUSED(v) /*@unused@*/ v
|
||||||
#else
|
#else
|
||||||
|
@ -114,9 +114,6 @@ EXTERN u32_t ioapic_id_mask[8];
|
|||||||
EXTERN u32_t lapic_id_mask[8];
|
EXTERN u32_t lapic_id_mask[8];
|
||||||
EXTERN u32_t lapic_addr_vaddr; /* we remember the virtual address here until we
|
EXTERN u32_t lapic_addr_vaddr; /* we remember the virtual address here until we
|
||||||
switch to paging */
|
switch to paging */
|
||||||
EXTERN u32_t lapic_addr;
|
|
||||||
EXTERN u32_t lapic_eoi_addr;
|
|
||||||
EXTERN u32_t lapic_taskpri_addr;
|
|
||||||
|
|
||||||
_PROTOTYPE (void calc_bus_clock, (void));
|
_PROTOTYPE (void calc_bus_clock, (void));
|
||||||
_PROTOTYPE (u32_t lapic_errstatus, (void));
|
_PROTOTYPE (u32_t lapic_errstatus, (void));
|
||||||
|
@ -72,7 +72,6 @@ _PROTOTYPE( void int86, (void) );
|
|||||||
_PROTOTYPE( reg_t read_cr0, (void) );
|
_PROTOTYPE( reg_t read_cr0, (void) );
|
||||||
_PROTOTYPE( reg_t read_cr2, (void) );
|
_PROTOTYPE( reg_t read_cr2, (void) );
|
||||||
_PROTOTYPE( void write_cr0, (unsigned long value) );
|
_PROTOTYPE( void write_cr0, (unsigned long value) );
|
||||||
_PROTOTYPE( unsigned long read_cr3, (void) );
|
|
||||||
_PROTOTYPE( unsigned long read_cr4, (void) );
|
_PROTOTYPE( unsigned long read_cr4, (void) );
|
||||||
_PROTOTYPE( void write_cr4, (unsigned long value) );
|
_PROTOTYPE( void write_cr4, (unsigned long value) );
|
||||||
_PROTOTYPE( unsigned long read_cpu_flags, (void) );
|
_PROTOTYPE( unsigned long read_cpu_flags, (void) );
|
||||||
|
@ -99,7 +99,6 @@ STATIC CHAR *editinput();
|
|||||||
extern int read();
|
extern int read();
|
||||||
extern int write();
|
extern int write();
|
||||||
#if defined(USE_TERMCAP)
|
#if defined(USE_TERMCAP)
|
||||||
extern char *getenv();
|
|
||||||
extern char *tgetstr();
|
extern char *tgetstr();
|
||||||
extern int tgetent();
|
extern int tgetent();
|
||||||
#endif /* defined(USE_TERMCAP) */
|
#endif /* defined(USE_TERMCAP) */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user