summaryrefslogtreecommitdiffstats
path: root/cpukit/libnetworking/machine
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-07-30 23:31:00 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-07-30 23:31:00 +0000
commit9fcd1a1c58492117f4e90a74bedac55cd43f4d3d (patch)
tree25e87645263acffebdfeddca350fc8f5aacfb7a0 /cpukit/libnetworking/machine
parent2002-07-30 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-9fcd1a1c58492117f4e90a74bedac55cd43f4d3d.tar.bz2
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.
Diffstat (limited to 'cpukit/libnetworking/machine')
-rw-r--r--cpukit/libnetworking/machine/Makefile.am4
-rw-r--r--cpukit/libnetworking/machine/endian.h2
-rw-r--r--cpukit/libnetworking/machine/types.h37
3 files changed, 3 insertions, 40 deletions
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_ */