summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/exec/libnetworking/ChangeLog10
-rw-r--r--c/src/exec/libnetworking/machine/types.h19
-rw-r--r--c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h2
-rw-r--r--c/src/libnetworking/ChangeLog10
-rw-r--r--c/src/libnetworking/machine/types.h19
-rw-r--r--c/src/libnetworking/pppd/pppd.h1
-rw-r--r--c/src/libnetworking/rtems/rtems_bsdnet_internal.h2
-rw-r--r--c/src/libnetworking/rtems_webserver/webmain.c1
-rw-r--r--cpukit/httpd/webmain.c1
-rw-r--r--cpukit/libnetworking/ChangeLog10
-rw-r--r--cpukit/libnetworking/machine/types.h19
-rw-r--r--cpukit/libnetworking/rtems/rtems_bsdnet_internal.h2
-rw-r--r--cpukit/pppd/pppd.h1
13 files changed, 70 insertions, 27 deletions
diff --git a/c/src/exec/libnetworking/ChangeLog b/c/src/exec/libnetworking/ChangeLog
index b07e15fa92..fbecc31cc0 100644
--- a/c/src/exec/libnetworking/ChangeLog
+++ b/c/src/exec/libnetworking/ChangeLog
@@ -1,3 +1,13 @@
+2000-09-22 Joel Sherrill <joel@OARcorp.com>
+
+ * machine/types.h, pppd/pppd.h, rtems/rtems_bsdnet_internal.h,
+ rtems_webserver/webmain.c: machine/types.h should not have
+ included rtems.h. It is now including precisely the
+ least amount of low level, yet portable .h files to get
+ the basic RTEMS types defined. This rippled into other
+ files since rtems_bsdnet_internal.h used machine/types.h to include
+ rtems.h.
+
2000-09-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ChangeLog: Cleanup.
diff --git a/c/src/exec/libnetworking/machine/types.h b/c/src/exec/libnetworking/machine/types.h
index 730a6dec1d..8383448bb3 100644
--- a/c/src/exec/libnetworking/machine/types.h
+++ b/c/src/exec/libnetworking/machine/types.h
@@ -10,18 +10,19 @@
#ifndef _MACHINE_TYPES_H_
#define _MACHINE_TYPES_H_
-#include <rtems.h>
+#include <rtems/system.h>
+#include <rtems/score/cpu.h>
#include <machine/endian.h>
-typedef rtems_signed64 int64_t;
-typedef rtems_signed32 int32_t;
-typedef rtems_signed16 int16_t;
-typedef rtems_signed8 int8_t;
+typedef signed64 int64_t;
+typedef signed32 int32_t;
+typedef signed16 int16_t;
+typedef signed8 int8_t;
-typedef rtems_unsigned64 u_int64_t;
-typedef rtems_unsigned32 u_int32_t;
-typedef rtems_unsigned16 u_int16_t;
-typedef rtems_unsigned8 u_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
diff --git a/c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h b/c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h
index 51b7b919eb..bc73288ae4 100644
--- a/c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h
+++ b/c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h
@@ -12,6 +12,8 @@
#ifndef _RTEMS_BSDNET_INTERNAL_H_
#define _RTEMS_BSDNET_INTERNAL_H_
+#include <rtems.h>
+
typedef unsigned int vm_offset_t;
typedef long long vm_ooffset_t;
typedef unsigned int vm_pindex_t;
diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog
index b07e15fa92..fbecc31cc0 100644
--- a/c/src/libnetworking/ChangeLog
+++ b/c/src/libnetworking/ChangeLog
@@ -1,3 +1,13 @@
+2000-09-22 Joel Sherrill <joel@OARcorp.com>
+
+ * machine/types.h, pppd/pppd.h, rtems/rtems_bsdnet_internal.h,
+ rtems_webserver/webmain.c: machine/types.h should not have
+ included rtems.h. It is now including precisely the
+ least amount of low level, yet portable .h files to get
+ the basic RTEMS types defined. This rippled into other
+ files since rtems_bsdnet_internal.h used machine/types.h to include
+ rtems.h.
+
2000-09-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ChangeLog: Cleanup.
diff --git a/c/src/libnetworking/machine/types.h b/c/src/libnetworking/machine/types.h
index 730a6dec1d..8383448bb3 100644
--- a/c/src/libnetworking/machine/types.h
+++ b/c/src/libnetworking/machine/types.h
@@ -10,18 +10,19 @@
#ifndef _MACHINE_TYPES_H_
#define _MACHINE_TYPES_H_
-#include <rtems.h>
+#include <rtems/system.h>
+#include <rtems/score/cpu.h>
#include <machine/endian.h>
-typedef rtems_signed64 int64_t;
-typedef rtems_signed32 int32_t;
-typedef rtems_signed16 int16_t;
-typedef rtems_signed8 int8_t;
+typedef signed64 int64_t;
+typedef signed32 int32_t;
+typedef signed16 int16_t;
+typedef signed8 int8_t;
-typedef rtems_unsigned64 u_int64_t;
-typedef rtems_unsigned32 u_int32_t;
-typedef rtems_unsigned16 u_int16_t;
-typedef rtems_unsigned8 u_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
diff --git a/c/src/libnetworking/pppd/pppd.h b/c/src/libnetworking/pppd/pppd.h
index 274eb07176..b33b6a32de 100644
--- a/c/src/libnetworking/pppd/pppd.h
+++ b/c/src/libnetworking/pppd/pppd.h
@@ -26,6 +26,7 @@
#ifndef __PPPD_H__
#define __PPPD_H__
+#include <rtems.h>
#include <stdio.h> /* for FILE */
#include <sys/param.h> /* for MAXPATHLEN and BSD4_4, if defined */
#include <sys/types.h> /* for u_int32_t, if defined */
diff --git a/c/src/libnetworking/rtems/rtems_bsdnet_internal.h b/c/src/libnetworking/rtems/rtems_bsdnet_internal.h
index 51b7b919eb..bc73288ae4 100644
--- a/c/src/libnetworking/rtems/rtems_bsdnet_internal.h
+++ b/c/src/libnetworking/rtems/rtems_bsdnet_internal.h
@@ -12,6 +12,8 @@
#ifndef _RTEMS_BSDNET_INTERNAL_H_
#define _RTEMS_BSDNET_INTERNAL_H_
+#include <rtems.h>
+
typedef unsigned int vm_offset_t;
typedef long long vm_ooffset_t;
typedef unsigned int vm_pindex_t;
diff --git a/c/src/libnetworking/rtems_webserver/webmain.c b/c/src/libnetworking/rtems_webserver/webmain.c
index 264a8d66c5..9f9e2c375e 100644
--- a/c/src/libnetworking/rtems_webserver/webmain.c
+++ b/c/src/libnetworking/rtems_webserver/webmain.c
@@ -23,6 +23,7 @@
#include <sys/time.h>
#include <pthread.h>
+#include <rtems.h>
#include <rtems/error.h>
#ifdef WEBS_SSL_SUPPORT
diff --git a/cpukit/httpd/webmain.c b/cpukit/httpd/webmain.c
index 264a8d66c5..9f9e2c375e 100644
--- a/cpukit/httpd/webmain.c
+++ b/cpukit/httpd/webmain.c
@@ -23,6 +23,7 @@
#include <sys/time.h>
#include <pthread.h>
+#include <rtems.h>
#include <rtems/error.h>
#ifdef WEBS_SSL_SUPPORT
diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog
index b07e15fa92..fbecc31cc0 100644
--- a/cpukit/libnetworking/ChangeLog
+++ b/cpukit/libnetworking/ChangeLog
@@ -1,3 +1,13 @@
+2000-09-22 Joel Sherrill <joel@OARcorp.com>
+
+ * machine/types.h, pppd/pppd.h, rtems/rtems_bsdnet_internal.h,
+ rtems_webserver/webmain.c: machine/types.h should not have
+ included rtems.h. It is now including precisely the
+ least amount of low level, yet portable .h files to get
+ the basic RTEMS types defined. This rippled into other
+ files since rtems_bsdnet_internal.h used machine/types.h to include
+ rtems.h.
+
2000-09-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ChangeLog: Cleanup.
diff --git a/cpukit/libnetworking/machine/types.h b/cpukit/libnetworking/machine/types.h
index 730a6dec1d..8383448bb3 100644
--- a/cpukit/libnetworking/machine/types.h
+++ b/cpukit/libnetworking/machine/types.h
@@ -10,18 +10,19 @@
#ifndef _MACHINE_TYPES_H_
#define _MACHINE_TYPES_H_
-#include <rtems.h>
+#include <rtems/system.h>
+#include <rtems/score/cpu.h>
#include <machine/endian.h>
-typedef rtems_signed64 int64_t;
-typedef rtems_signed32 int32_t;
-typedef rtems_signed16 int16_t;
-typedef rtems_signed8 int8_t;
+typedef signed64 int64_t;
+typedef signed32 int32_t;
+typedef signed16 int16_t;
+typedef signed8 int8_t;
-typedef rtems_unsigned64 u_int64_t;
-typedef rtems_unsigned32 u_int32_t;
-typedef rtems_unsigned16 u_int16_t;
-typedef rtems_unsigned8 u_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
diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
index 51b7b919eb..bc73288ae4 100644
--- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
+++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
@@ -12,6 +12,8 @@
#ifndef _RTEMS_BSDNET_INTERNAL_H_
#define _RTEMS_BSDNET_INTERNAL_H_
+#include <rtems.h>
+
typedef unsigned int vm_offset_t;
typedef long long vm_ooffset_t;
typedef unsigned int vm_pindex_t;
diff --git a/cpukit/pppd/pppd.h b/cpukit/pppd/pppd.h
index 274eb07176..b33b6a32de 100644
--- a/cpukit/pppd/pppd.h
+++ b/cpukit/pppd/pppd.h
@@ -26,6 +26,7 @@
#ifndef __PPPD_H__
#define __PPPD_H__
+#include <rtems.h>
#include <stdio.h> /* for FILE */
#include <sys/param.h> /* for MAXPATHLEN and BSD4_4, if defined */
#include <sys/types.h> /* for u_int32_t, if defined */