Remove some duplicate declarations in headers.

Explicitly declare some functions as returning void.

diff --git a/commands/elle/sbm.c b/commands/elle/sbm.c
index e3149715e85044c207ee4fdf1a4a6d23f8c5cfa4..fa4fe0186f94ee9c38b1ffcd582d9716ea8293d2 100644 (file)
--- a/commands/elle/sbm.c
+++ b/commands/elle/sbm.c
@@ -499,6 +499,7 @@ unsigned size;
 \f
 /* SBM_MFREE(sm) - Free up an allocated memory area.
  */
+void
 sbm_mfree(sm)
 register struct smblk *sm;
 {       register struct smblk *smx;

diff --git a/commands/elle/sbproto.h b/commands/elle/sbproto.h
index 007bbbfad0816f867fd4dfa84d9e002e1d91f1f0..a7ad5455df815f587bca09bd993dd01d5df7a466 100644 (file)
--- a/commands/elle/sbproto.h
+++ b/commands/elle/sbproto.h
@@ -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( struct smblk *sbm_mget, (SBMO cmin, SBMO cmax) );
 _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( int sbm_mmrg, (struct smblk *smp) );
 _PROTOTYPE( struct smblk *sbm_split, (struct smblk *smp, SBMO coff) );

diff --git a/include/minix/const.h b/include/minix/const.h
index c528f0b746bab46c6c931774763356ca0cdca425..736980c9deedc0912e945bf9989290d6c5d0e356 100644 (file)
--- a/include/minix/const.h
+++ b/include/minix/const.h
@@ -21,10 +21,10 @@
  */
 
 #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))
-#elif defined _lint
-# define UNUSED(v) /*lint -e(715)*/ v
 #elif defined __LCLINT__
 # define UNUSED(v) /*@unused@*/ v
 #else

diff --git a/kernel/arch/i386/apic.h b/kernel/arch/i386/apic.h
index 96bf27aa10751636c6d60c1a43b3822e14623ad2..45f8c9cb464bfd1893a601add2d1c7054da084b3 100644 (file)
--- a/kernel/arch/i386/apic.h
+++ b/kernel/arch/i386/apic.h
@@ -114,9 +114,6 @@ EXTERN u32_t ioapic_id_mask[8];
 EXTERN u32_t lapic_id_mask[8];
 EXTERN u32_t lapic_addr_vaddr; /* we remember the virtual address here until we
                                  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 (u32_t lapic_errstatus, (void));

diff --git a/kernel/arch/i386/proto.h b/kernel/arch/i386/proto.h
index ee25a003b5249bd61a1e87e63b68e0b833eadefd..7a8ed83561e10f5c11c14ec7812355d5beb63276 100644 (file)
--- a/kernel/arch/i386/proto.h
+++ b/kernel/arch/i386/proto.h
@@ -72,7 +72,6 @@ _PROTOTYPE( void int86, (void)                                        );
 _PROTOTYPE( reg_t read_cr0, (void)                                     );
 _PROTOTYPE( reg_t read_cr2, (void)                                     );
 _PROTOTYPE( void write_cr0, (unsigned long value)                       );
-_PROTOTYPE( unsigned long read_cr3, (void)                              );
 _PROTOTYPE( unsigned long read_cr4, (void)                              );
 _PROTOTYPE( void write_cr4, (unsigned long value)                       );
 _PROTOTYPE( unsigned long read_cpu_flags, (void)                        );

diff --git a/lib/libedit/editline.c b/lib/libedit/editline.c
index b17be01d1bbd61418fbb6871dbdcab286782fee6..8e7e56ee70bcdc86b35bb50fe994a03483b6c23d 100644 (file)
--- a/lib/libedit/editline.c
+++ b/lib/libedit/editline.c
@@ -99,7 +99,6 @@ STATIC CHAR   *editinput();
 extern int     read();
 extern int     write();
 #if    defined(USE_TERMCAP)
-extern char    *getenv();
 extern char    *tgetstr();
 extern int     tgetent();
 #endif /* defined(USE_TERMCAP) */