2002-07-30 Joel Sherrill <joel@OARcorp.com>

	* machine/types.h: Removed as a simpler version of this file is
	now part of the RTEMS newlib support.
	* machine/Makefile.am, machine/endian.h, nfs/bootp_subr.c,
	rtems/rtems_bsdnet_internal.h, sys/Makefile.am, sys/systm.h:
	Minor modifications to use the simpler machine/types.h.  Mostly
	more complete sets of #include's to account for machine/types.h
	no longer doing this.

8 files changed, 19 insertions, 43 deletions

diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog
index 7c3ccd6035..99d6cbf961 100644
--- a/cpukit/libnetworking/ChangeLog
+++ b/cpukit/libnetworking/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-30	Joel Sherrill <joel@OARcorp.com>
+
+	* machine/types.h: Removed as a simpler version of this file is
+	now part of the RTEMS newlib support.
+	* machine/Makefile.am, machine/endian.h, nfs/bootp_subr.c,
+	rtems/rtems_bsdnet_internal.h, sys/Makefile.am, sys/systm.h:
+	Minor modifications to use the simpler machine/types.h.  Mostly
+	more complete sets of #include's to account for machine/types.h
+	no longer doing this.
+
 2002-07-30	Jay Monkman <jtm@smoothsmoothie.com>
 
 	* netinet/in_cksum.c, netinet/in_cksum_arm.c: Added ARM in_cksum
diff --git a/cpukit/libnetworking/machine/Makefile.am b/cpukit/libnetworking/machine/Makefile.am
index b3c8f64282..6e1f3371df 100644
--- a/cpukit/libnetworking/machine/Makefile.am
+++ b/cpukit/libnetworking/machine/Makefile.am
@@ -5,8 +5,8 @@
 
 include_machinedir = $(includedir)/machine
 
-include_machine_HEADERS = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h param.h \
-    types.h vmparam.h
+include_machine_HEADERS = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h \
+    param.h vmparam.h
 
 PREINSTALL_FILES = $(PROJECT_INCLUDE)/machine \
     $(include_machine_HEADERS:%=$(PROJECT_INCLUDE)/machine/%)
diff --git a/cpukit/libnetworking/machine/endian.h b/cpukit/libnetworking/machine/endian.h
index 6b17da58d3..0b12bbf05d 100644
--- a/cpukit/libnetworking/machine/endian.h
+++ b/cpukit/libnetworking/machine/endian.h
@@ -5,7 +5,7 @@
 #ifndef _MACHINE_ENDIAN_H_
 #define _MACHINE_ENDIAN_H_
 
-#include <rtems/score/cpu.h>
+#include <rtems.h>
 
 /*
  * BSD-style endian declaration
diff --git a/cpukit/libnetworking/machine/types.h b/cpukit/libnetworking/machine/types.h
deleted file mode 100644
index 5e1f327e6f..0000000000
--- a/cpukit/libnetworking/machine/types.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file will have to be incorparated into the RTEMS source
- * tree (probably in the existing <machine/types.h> so that these
- * contents are included when an application source file includes
- * <sys/types.h>.
- *
- *  $Id$
- */
-
-#ifndef _MACHINE_TYPES_H_
-#define _MACHINE_TYPES_H_
-
-#include <rtems/system.h>
-#include <rtems/score/cpu.h>
-#include <machine/endian.h>
-
-typedef signed64	int64_t;
-typedef signed32	int32_t;
-typedef signed16	int16_t;
-typedef signed8		int8_t;
-
-typedef unsigned64	u_int64_t;
-typedef unsigned32	u_int32_t;
-typedef unsigned16	u_int16_t;
-typedef unsigned8	u_int8_t;
-
-#define	_CLOCK_T_	unsigned long
-#define	_TIME_T_	long
-#define _CLOCKID_T_     unsigned long
-#define _TIMER_T_       unsigned long
-
-#ifdef _COMPILING_BSD_KERNEL_
-#include <rtems/rtems_bsdnet_internal.h>
-#include <rtems/rtems_bsdnet.h>
-#endif
-
-#endif /* _MACHINE_TYPES_H_ */
diff --git a/cpukit/libnetworking/nfs/bootp_subr.c b/cpukit/libnetworking/nfs/bootp_subr.c
index ceb471dad0..0d0eb3c4d0 100644
--- a/cpukit/libnetworking/nfs/bootp_subr.c
+++ b/cpukit/libnetworking/nfs/bootp_subr.c
@@ -73,6 +73,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <rtems/mkrootfs.h>
+#include <rtems/rtems_bsdnet.h>
 
 #define BOOTP_MIN_LEN		300	/* Minimum size of bootp udp packet */
 
diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
index 4b8c4fa652..6b748b3de5 100644
--- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
+++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
@@ -24,8 +24,8 @@ typedef	unsigned int		vm_size_t;
 #define _BSD_VA_LIST_	char *
 
 /* make sure we get the network versions of these */
-#include "../machine/types.h"
-#include "../machine/param.h"
+#include <machine/types.h>
+#include <machine/param.h>
 
 #include <sys/time.h>
 /*
diff --git a/cpukit/libnetworking/sys/Makefile.am b/cpukit/libnetworking/sys/Makefile.am
index 058b9e166e..90691059ca 100644
--- a/cpukit/libnetworking/sys/Makefile.am
+++ b/cpukit/libnetworking/sys/Makefile.am
@@ -4,8 +4,9 @@
 
 include_sysdir = $(includedir)/sys
 
+# param.h now in newlib 30 July 2002 Joel
 include_sys_HEADERS = buf.h callout.h conf.h domain.h kernel.h libkern.h \
-    malloc.h mbuf.h mount.h param.h proc.h protosw.h queue.h reboot.h \
+    malloc.h mbuf.h mount.h proc.h protosw.h queue.h reboot.h \
     resourcevar.h rtprio.h select.h signalvar.h socket.h socketvar.h \
     sysctl.h syslimits.h syslog.h systm.h ttydefaults.h ucred.h \
     uio.h un.h
diff --git a/cpukit/libnetworking/sys/systm.h b/cpukit/libnetworking/sys/systm.h
index 7e14867e70..3363140dbe 100644
--- a/cpukit/libnetworking/sys/systm.h
+++ b/cpukit/libnetworking/sys/systm.h
@@ -42,6 +42,7 @@
 #ifndef _SYS_SYSTM_H_
 #define	_SYS_SYSTM_H_
 
+#include <rtems/rtems_bsdnet_internal.h> /* for __BSD_VA_LIST__ */
 #include <machine/cpufunc.h>
 
 extern int securelevel;		/* system security level (see init(8)) */