Changeset 9fcd1a1c in rtems

Timestamp:

Jul 30, 2002, 11:31:00 PM (17 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

08943ebf

Parents:

5af0cf2f

Message:

2002-07-30 Joel Sherrill <joel@…>

• 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.

Location:

cpukit/libnetworking

Files:

• ChangeLog (modified) (1 diff)
• machine/Makefile.am (modified) (1 diff)
• machine/endian.h (modified) (1 diff)
• machine/types.h (deleted)
• nfs/bootp_subr.c (modified) (1 diff)
• rtems/rtems_bsdnet_internal.h (modified) (1 diff)
• sys/Makefile.am (modified) (1 diff)
• sys/systm.h (modified) (1 diff)

cpukit/libnetworking/ChangeLog

@@ +1 @@
+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>
 

cpukit/libnetworking/machine/Makefile.am

@@ -6 +6 @@
 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 \

cpukit/libnetworking/machine/endian.h

@@ -6 +6 @@
 #define _MACHINE_ENDIAN_H_
 
-#include <rtems/score/cpu.h>
+#include <rtems.h>
 
 /*

cpukit/libnetworking/nfs/bootp_subr.c

@@ -74 +74 @@
 #include <fcntl.h>
 #include <rtems/mkrootfs.h>
+#include <rtems/rtems_bsdnet.h>
 
 #define BOOTP_MIN_LEN           300     /* Minimum size of bootp udp packet */

cpukit/libnetworking/rtems/rtems_bsdnet_internal.h

@@ -25 +25 @@
 
 /* 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>

cpukit/libnetworking/sys/Makefile.am

@@ -5 +5 @@
 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 \

cpukit/libnetworking/sys/systm.h

@@ -43 +43 @@
 #define _SYS_SYSTM_H_
 
+#include <rtems/rtems_bsdnet_internal.h> /* for __BSD_VA_LIST__ */
 #include <machine/cpufunc.h>