Rationalised use of #includes to be more standards-compliant.

diff --git a/mach/6500/dl/dl.c b/mach/6500/dl/dl.c
index f8581d0..43eb824 100644 (file)
--- a/mach/6500/dl/dl.c
+++ b/mach/6500/dl/dl.c
@@ -5,9 +5,10 @@
  *
  */
 
-#include       <stdio.h>
-#include       <assert.h>
-#include       <out.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+#include "out.h"
 
 #define        DATTYPE         0
 #define        EOFTYPE         1
@@ -57,7 +58,6 @@ main(argc,argv) char **argv; {
                pc = sect[i].os_base;
                while (sect[i].os_size) {
                        unsigned int sz = 8096, fl;
-                       extern char *calloc();
                        register char *buf;
                        char *pbuf;
 
@@ -165,7 +165,10 @@ reply() {
        write(1,&c,1);
 }
 
-fatal(s,a) {
+fatal(s,a)
+       const char* s;
+       const char* a;
+{
 
        fprintf(stderr,"%s: ",progname);
        fprintf(stderr,s,a);

diff --git a/modules/src/em_mes/C_ms_com.c b/modules/src/em_mes/C_ms_com.c
index 4ffed9e..b6d2210 100644 (file)
--- a/modules/src/em_mes/C_ms_com.c
+++ b/modules/src/em_mes/C_ms_com.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 <stdlib.h>
+#include <string.h>
 #include <em.h>
 #include <em_mes.h>
 

diff --git a/modules/src/em_mes/C_ms_src.c b/modules/src/em_mes/C_ms_src.c
index 5e98a62..5831681 100644 (file)
--- a/modules/src/em_mes/C_ms_src.c
+++ b/modules/src/em_mes/C_ms_src.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 <stdlib.h>
+#include <string.h>
 #include <em.h>
 #include <em_mes.h>
 

diff --git a/modules/src/em_mes/C_ms_stb.c b/modules/src/em_mes/C_ms_stb.c
index 114ea6e..430dea3 100644 (file)
--- a/modules/src/em_mes/C_ms_stb.c
+++ b/modules/src/em_mes/C_ms_stb.c
@@ -3,6 +3,9 @@
  * (c) copyright 1990 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
+ 
+#include <stdlib.h>
+#include <string.h>
 #include <em.h>
 #include <em_mes.h>
 

diff --git a/modules/src/em_mes/C_ms_std.c b/modules/src/em_mes/C_ms_std.c
index 8c101a2..0399fa8 100644 (file)
--- a/modules/src/em_mes/C_ms_std.c
+++ b/modules/src/em_mes/C_ms_std.c
@@ -3,6 +3,9 @@
  * (c) copyright 1990 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
+ 
+#include <stdlib.h>
+#include <string.h>
 #include <em.h>
 #include <em_mes.h>
 

diff --git a/modules/src/flt_arith/flt_misc.h b/modules/src/flt_arith/flt_misc.h
index 077bf30..ec85069 100644 (file)
--- a/modules/src/flt_arith/flt_misc.h
+++ b/modules/src/flt_arith/flt_misc.h
@@ -4,7 +4,7 @@
  */
 /* $Id$ */
 
-#include <flt_arith.h>
+#include "flt_arith.h"
 
 /* some short-hands ... */
 #define m1 flt_mantissa.flt_h_32

diff --git a/util/misc/convert.c b/util/misc/convert.c
index e9bc8a6..ec38761 100644 (file)
--- a/util/misc/convert.c
+++ b/util/misc/convert.c
@@ -16,14 +16,15 @@ static char rcsid[] = "$Id$";
        linked.
 */
 
-#include       <system.h>
-#include        <em_pseu.h>
-#include       <em_mnem.h>
-#include        <em_spec.h>
-#include        <em_flag.h>
-#include        <em_ptyp.h>
-#include       <em.h>
-#include       <em_comp.h>
+#include <stdlib.h>
+#include "system.h"
+#include "em_pseu.h"
+#include "em_mnem.h"
+#include "em_spec.h"
+#include "em_flag.h"
+#include "em_ptyp.h"
+#include "em.h"
+#include "em_comp.h"
 
 char *filename;                        /* Name of input file */
 int errors;                    /* Number of errors */