Make compilable in our env. Involved disabling ELF support,

reordering includes (due to -Wstrict-prototypes) and other -Wall goo

4 files changed, 10 insertions, 7 deletions

diff --git a/sys/arch/alpha/stand/netboot/Makefile b/sys/arch/alpha/stand/netboot/Makefile
index f83b46d45ac..d05d684b225 100644
--- a/sys/arch/alpha/stand/netboot/Makefile
+++ b/sys/arch/alpha/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 1996/10/30 22:40:51 niklas Exp $
+#	$OpenBSD: Makefile,v 1.2 1996/11/27 19:54:54 niklas Exp $
 #	$NetBSD: Makefile,v 1.3 1996/10/18 06:02:24 thorpej Exp $
 
 .PATH: ${.CURDIR}/.. ${.CURDIR}/../../../../lib/libsa
@@ -11,7 +11,7 @@ BOOT_SRCS+= printf.c bzero.c rpcc.S
 
 BOOT_SRCS+= dev_net.c conf.c devopen.c
 BOOT_SRCS+= nfs.c rpc.c alloc.c ntohl.c htonl.c ntohs.c htons.c net.c bootp.c
-BOOT_SRCS+= strlen.c bcopy.c dev.c bcmp.c strerror.c rarp.c read.c lseek.c
+BOOT_SRCS+= strlen.c dev.c bcmp.c strerror.c rarp.c read.c lseek.c
 BOOT_SRCS+= in_cksum.c exit.c closeall.c arp.c strncpy.c globals.c open.c
 BOOT_SRCS+= close.c ether.c netif.c
 
@@ -25,7 +25,7 @@ AFLAGS += -DASSEMBLER
 CPPFLAGS += -I${.CURDIR}/../../../../ \
 	    -I${.CURDIR}/../../../../lib/libsa \
 	    -I${.CURDIR}/../.. -DPRIMARY_BOOTBLOCK \
-	    -DALPHA_BOOT_ECOFF -DALPHA_BOOT_ELF
+	    -DALPHA_BOOT_ECOFF # -DALPHA_BOOT_ELF
 CFLAGS = -Werror -mno-fp-regs -g
 
 CLEANFILES+= vers.c vers.o
diff --git a/sys/arch/alpha/stand/netboot/getsecs.c b/sys/arch/alpha/stand/netboot/getsecs.c
index 07ca9e539d1..16b8ab95da2 100644
--- a/sys/arch/alpha/stand/netboot/getsecs.c
+++ b/sys/arch/alpha/stand/netboot/getsecs.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: getsecs.c,v 1.1 1996/10/30 22:40:55 niklas Exp $	*/
+/*	$OpenBSD: getsecs.c,v 1.2 1996/11/27 19:54:55 niklas Exp $	*/
 
 #include <sys/param.h>
-#include "include/prom.h"
 #include "include/rpb.h"
+#include "include/prom.h"
 
 int
 getsecs()
diff --git a/sys/arch/alpha/stand/netboot/if_prom.c b/sys/arch/alpha/stand/netboot/if_prom.c
index 97664bb66ff..b091d49ffff 100644
--- a/sys/arch/alpha/stand/netboot/if_prom.c
+++ b/sys/arch/alpha/stand/netboot/if_prom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_prom.c,v 1.1 1996/10/30 22:40:56 niklas Exp $	*/
+/*	$OpenBSD: if_prom.c,v 1.2 1996/11/27 19:54:55 niklas Exp $	*/
 /*	$NetBSD: if_prom.c,v 1.4 1996/10/02 21:18:49 cgd Exp $	*/
 
 /*
@@ -39,8 +39,10 @@
 #include <netinet/in_systm.h>
 
 #include "netif.h"
+#include "include/rpb.h"
 #include "include/prom.h"
 #include "lib/libkern/libkern.h"
+#include "lib/libsa/stand.h"
 
 int prom_probe();
 int prom_match();
diff --git a/sys/arch/alpha/stand/netboot/netboot.c b/sys/arch/alpha/stand/netboot/netboot.c
index eac243df8e5..9f240bda3ca 100644
--- a/sys/arch/alpha/stand/netboot/netboot.c
+++ b/sys/arch/alpha/stand/netboot/netboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netboot.c,v 1.2 1996/11/27 12:07:55 mickey Exp $	*/
+/*	$OpenBSD: netboot.c,v 1.3 1996/11/27 19:54:56 niklas Exp $	*/
 /*	$NetBSD: netboot.c,v 1.1 1996/09/18 20:03:12 cgd Exp $	*/
 
 /*
@@ -46,6 +46,7 @@
 #include <sys/exec.h>
 #include <sys/exec_ecoff.h>
 
+#include <machine/rpb.h>
 #include <machine/prom.h>
 
 #define _KERNEL