Added prototyping stuff

diff --git a/modules/src/object/rd_arhdr.c b/modules/src/object/rd_arhdr.c
index 8ea9f77..48a6ec9 100644 (file)
--- a/modules/src/object/rd_arhdr.c
+++ b/modules/src/object/rd_arhdr.c
@@ -3,8 +3,7 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include <arch.h>
-#include "object.h"
+#include "obj.h"
 
 int
 rd_arhdr(fd, arhdr)

diff --git a/modules/src/object/rd_bytes.c b/modules/src/object/rd_bytes.c
index 9964e0a..a6a7922 100644 (file)
--- a/modules/src/object/rd_bytes.c
+++ b/modules/src/object/rd_bytes.c
@@ -3,6 +3,9 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
+
+#include "obj.h"
+
 #define MININT         (1 << (sizeof(int) * 8 - 1))
 #define MAXCHUNK       (~MININT)       /* Highest count we read(2).    */
 /* Unfortunately, MAXCHUNK is too large with some  compilers. Put it in
@@ -15,7 +18,7 @@ static int maxchunk = MAXCHUNK;
  * We don't have to worry about byte order here.
  * Just read "cnt" bytes from file-descriptor "fd".
  */
-int 
+void 
 rd_bytes(fd, string, cnt)
        register char   *string;
        register long   cnt;

diff --git a/modules/src/object/rd_int2.c b/modules/src/object/rd_int2.c
index a3078b6..a6ee91e 100644 (file)
--- a/modules/src/object/rd_int2.c
+++ b/modules/src/object/rd_int2.c
@@ -3,7 +3,7 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include "object.h"
+#include "obj.h"
 
 int
 rd_int2(fd)

diff --git a/modules/src/object/rd_long.c b/modules/src/object/rd_long.c
index e2caa99..8e1c9e1 100644 (file)
--- a/modules/src/object/rd_long.c
+++ b/modules/src/object/rd_long.c
@@ -3,7 +3,7 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include "object.h"
+#include "obj.h"
 
 long
 rd_long(fd)

diff --git a/modules/src/object/rd_ranlib.c b/modules/src/object/rd_ranlib.c
index b9cfdaf..c48f0a7 100644 (file)
--- a/modules/src/object/rd_ranlib.c
+++ b/modules/src/object/rd_ranlib.c
@@ -3,9 +3,9 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include <ranlib.h>
-#include "object.h"
+#include "obj.h"
 
+void
 rd_ranlib(fd, ran, cnt)
        register struct ranlib  *ran;
        register long   cnt;

diff --git a/modules/src/object/rd_unsig2.c b/modules/src/object/rd_unsig2.c
index 13a816f..a5151d1 100644 (file)
--- a/modules/src/object/rd_unsig2.c
+++ b/modules/src/object/rd_unsig2.c
@@ -3,7 +3,7 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include "object.h"
+#include "obj.h"
 
 unsigned int
 rd_unsigned2(fd)

diff --git a/modules/src/object/wr.c b/modules/src/object/wr.c
index ec20e83..f86af58 100644 (file)
--- a/modules/src/object/wr.c
+++ b/modules/src/object/wr.c
@@ -11,8 +11,7 @@
  *     part. In this case #define OUTSEEK.
  */
 
-#include <out.h>
-#include "object.h"
+#include "obj.h"
 
 extern long            lseek();
 
@@ -30,6 +29,7 @@ int                   __sectionnr;
 #define sectionnr      __sectionnr
 static int             offcnt;
 
+void
 __wr_flush(ptr)
        register struct fil *ptr;
 {
@@ -54,7 +54,8 @@ __wr_flush(ptr)
        ptr->pbegin = ptr->pbuf;
 }
 
-static OUTWRITE(p, b, n)
+static void
+OUTWRITE(p, b, n)
        int             p;      /* part number */
        register char   *b;     /* buffer pointer */
        long            n;      /* write count */
@@ -119,7 +120,8 @@ static OUTWRITE(p, b, n)
        }
 }
 
-static BEGINSEEK(p, o)
+static void
+BEGINSEEK(p, o)
        int             p;      /* part number */
        long            o;      /* offset in file */
 {
@@ -162,6 +164,7 @@ wr_open(f)
        return 1;
 }
 
+void
 wr_close()
 {
        register struct fil *ptr;
@@ -179,6 +182,7 @@ wr_close()
 #endif /* OUTSEEK */
 }
 
+void
 wr_ohead(head)
        register struct outhead *head;
 {
@@ -215,6 +219,7 @@ wr_ohead(head)
        else OUTWRITE(PARTEMIT, (char *)head, (long)SZ_HEAD);
 }
 
+void
 wr_sect(sect, cnt)
        register struct outsect *sect;
        register unsigned int   cnt;
@@ -263,6 +268,7 @@ wr_sect(sect, cnt)
 #endif
 }
 
+void
 wr_outsect(s)
        int             s;      /* section number */
 {
@@ -295,6 +301,7 @@ wr_outsect(s)
 /*
  * We don't have to worry about byte order here.
  */
+void
 wr_emit(emit, cnt)
        char            *emit;
        long            cnt;
@@ -302,6 +309,7 @@ wr_emit(emit, cnt)
        OUTWRITE(PARTEMIT + getsect(sectionnr) , emit, cnt);
 }
 
+void
 wr_relo(relo, cnt)
        register struct outrelo *relo;
        unsigned int cnt;
@@ -339,6 +347,7 @@ wr_relo(relo, cnt)
 #endif
 }
 
+void
 wr_name(name, cnt)
        register struct outname *name;
        unsigned int cnt;
@@ -374,6 +383,7 @@ wr_name(name, cnt)
 
 }
 
+void
 wr_string(addr, len)
        char *addr;
        long len;
@@ -384,6 +394,7 @@ wr_string(addr, len)
 
 #ifdef SYMDBUG
 
+void
 wr_dbug(buf, size)
        char            *buf;
        long            size;

diff --git a/modules/src/object/wr_arhdr.c b/modules/src/object/wr_arhdr.c
index a074f2d..006ec1a 100644 (file)
--- a/modules/src/object/wr_arhdr.c
+++ b/modules/src/object/wr_arhdr.c
@@ -3,9 +3,9 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include <arch.h>
-#include "object.h"
+#include "obj.h"
 
+void
 wr_arhdr(fd, arhdr)
        register struct ar_hdr  *arhdr;
 {

diff --git a/modules/src/object/wr_bytes.c b/modules/src/object/wr_bytes.c
index 36629da..f1c693d 100644 (file)
--- a/modules/src/object/wr_bytes.c
+++ b/modules/src/object/wr_bytes.c
@@ -3,6 +3,9 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
+
+#include "obj.h"
+
 #define MININT         (1 << (sizeof(int) * 8 - 1))
 #define MAXCHUNK       (~MININT)       /* Highest count we write(2).   */
 /* Notice that MAXCHUNK itself might be too large with some compilers.
@@ -14,6 +17,7 @@ static int maxchunk = MAXCHUNK;
 /*
  * Just write "cnt" bytes to file-descriptor "fd".
  */
+void
 wr_bytes(fd, string, cnt)
        register char   *string;
        register long   cnt;

diff --git a/modules/src/object/wr_int2.c b/modules/src/object/wr_int2.c
index 39966b1..67264e4 100644 (file)
--- a/modules/src/object/wr_int2.c
+++ b/modules/src/object/wr_int2.c
@@ -3,8 +3,9 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include "object.h"
+#include "obj.h"
 
+void
 wr_int2(fd, i)
 {
        char buf[2];

diff --git a/modules/src/object/wr_long.c b/modules/src/object/wr_long.c
index c5df7d8..e1ba444 100644 (file)
--- a/modules/src/object/wr_long.c
+++ b/modules/src/object/wr_long.c
@@ -3,8 +3,9 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include "object.h"
+#include "obj.h"
 
+void
 wr_long(fd, l)
        long l;
 {

diff --git a/modules/src/object/wr_putc.c b/modules/src/object/wr_putc.c
index 18ef03a..10fdefe 100644 (file)
--- a/modules/src/object/wr_putc.c
+++ b/modules/src/object/wr_putc.c
@@ -3,10 +3,11 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include "object.h"
+#include "obj.h"
 
 extern int __sectionnr;
 
+void
 wr_putc(ch)
 {
        register struct fil *ptr = &__parts[PARTEMIT+getsect(__sectionnr)];

diff --git a/modules/src/object/wr_ranlib.c b/modules/src/object/wr_ranlib.c
index 2b4532f..fbf53f5 100644 (file)
--- a/modules/src/object/wr_ranlib.c
+++ b/modules/src/object/wr_ranlib.c
@@ -3,9 +3,9 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include <ranlib.h>
-#include "object.h"
+#include "obj.h"
 
+void
 wr_ranlib(fd, ran, cnt1)
        struct ranlib   *ran;
        long    cnt1;