From 1b8212423d18de6bee414454b78481a5287cd496 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 6 Oct 1999 20:37:26 +0000
Subject: Modified to avoid conflicts on definitions of malloc.  newlib 1.8.2
 now prototypes the malloc family in stdlib.h.  This causes conflicts with the
 way the network stack overrides the definitions of malloc. As best I (being
 Joel) can tell, commenting stdlib.h out keeps the files compiling and
 referencing the desired malloc/free but results in more warnings.

---
 c/src/exec/libnetworking/rtems/rtems_select.c       | 2 +-
 c/src/exec/libnetworking/rtems/rtems_showroute.c    | 2 +-
 c/src/exec/libnetworking/rtems/rtems_syscall.c      | 2 +-
 c/src/lib/libbsp/powerpc/mvme2307/network/network.c | 2 +-
 c/src/libnetworking/rtems/rtems_select.c            | 2 +-
 c/src/libnetworking/rtems/rtems_showroute.c         | 2 +-
 c/src/libnetworking/rtems/rtems_syscall.c           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'c')

diff --git a/c/src/exec/libnetworking/rtems/rtems_select.c b/c/src/exec/libnetworking/rtems/rtems_select.c
index 2219c145f3..9a58456e00 100644
--- a/c/src/exec/libnetworking/rtems/rtems_select.c
+++ b/c/src/exec/libnetworking/rtems/rtems_select.c
@@ -4,7 +4,7 @@
 
 #include <string.h>
 #include <stdarg.h>
-#include <stdlib.h>
+/* #include <stdlib.h> */
 #include <stdio.h>
 
 #include <rtems.h>
diff --git a/c/src/exec/libnetworking/rtems/rtems_showroute.c b/c/src/exec/libnetworking/rtems/rtems_showroute.c
index b8196de8d3..e471ccc58c 100644
--- a/c/src/exec/libnetworking/rtems/rtems_showroute.c
+++ b/c/src/exec/libnetworking/rtems/rtems_showroute.c
@@ -2,7 +2,7 @@
  *  $Id$
  */
 
-#include <stdlib.h>
+/* #include <stdlib.h> */
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/c/src/exec/libnetworking/rtems/rtems_syscall.c b/c/src/exec/libnetworking/rtems/rtems_syscall.c
index 72fb43688e..05217f7212 100644
--- a/c/src/exec/libnetworking/rtems/rtems_syscall.c
+++ b/c/src/exec/libnetworking/rtems/rtems_syscall.c
@@ -4,7 +4,7 @@
 
 #include <string.h>
 #include <stdarg.h>
-#include <stdlib.h>
+/* #include <stdlib.h> */
 #include <stdio.h>
 
 #include <rtems.h>
diff --git a/c/src/lib/libbsp/powerpc/mvme2307/network/network.c b/c/src/lib/libbsp/powerpc/mvme2307/network/network.c
index 6e4e0b2ed2..6f147ec6f0 100644
--- a/c/src/lib/libbsp/powerpc/mvme2307/network/network.c
+++ b/c/src/lib/libbsp/powerpc/mvme2307/network/network.c
@@ -17,7 +17,7 @@
 #include <pcibios.h>
 #endif
 
-#include <stdlib.h>
+/* #include <stdlib.h> */
 #include <stdio.h>
 #include <stdarg.h>
 #include <rtems/error.h>
diff --git a/c/src/libnetworking/rtems/rtems_select.c b/c/src/libnetworking/rtems/rtems_select.c
index 2219c145f3..9a58456e00 100644
--- a/c/src/libnetworking/rtems/rtems_select.c
+++ b/c/src/libnetworking/rtems/rtems_select.c
@@ -4,7 +4,7 @@
 
 #include <string.h>
 #include <stdarg.h>
-#include <stdlib.h>
+/* #include <stdlib.h> */
 #include <stdio.h>
 
 #include <rtems.h>
diff --git a/c/src/libnetworking/rtems/rtems_showroute.c b/c/src/libnetworking/rtems/rtems_showroute.c
index b8196de8d3..e471ccc58c 100644
--- a/c/src/libnetworking/rtems/rtems_showroute.c
+++ b/c/src/libnetworking/rtems/rtems_showroute.c
@@ -2,7 +2,7 @@
  *  $Id$
  */
 
-#include <stdlib.h>
+/* #include <stdlib.h> */
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/c/src/libnetworking/rtems/rtems_syscall.c b/c/src/libnetworking/rtems/rtems_syscall.c
index 72fb43688e..05217f7212 100644
--- a/c/src/libnetworking/rtems/rtems_syscall.c
+++ b/c/src/libnetworking/rtems/rtems_syscall.c
@@ -4,7 +4,7 @@
 
 #include <string.h>
 #include <stdarg.h>
-#include <stdlib.h>
+/* #include <stdlib.h> */
 #include <stdio.h>
 
 #include <rtems.h>
-- 
cgit v1.2.3