From be22768407aef504d7376cdda3e5cee9643f4503 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 28 Oct 1999 14:50:43 +0000
Subject: Added use of __rtems__ rather than LINUX for RTEMS configuration.

---
 cpukit/httpd/Makefile.in | 2 +-
 cpukit/httpd/misc.c      | 6 +++---
 cpukit/httpd/uemf.h      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'cpukit/httpd')

diff --git a/cpukit/httpd/Makefile.in b/cpukit/httpd/Makefile.in
index 2951acb714..392760195b 100644
--- a/cpukit/httpd/Makefile.in
+++ b/cpukit/httpd/Makefile.in
@@ -35,7 +35,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 # Add local stuff here using +=
 #
 
-DEFINES += -DWEBS -DUEMF -DOS="LINUX" -DLINUX
+DEFINES += -DWEBS -DUEMF -DOS="RTEMS"
 CPPFLAGS +=
 CFLAGS +=
 
diff --git a/cpukit/httpd/misc.c b/cpukit/httpd/misc.c
index 5fbe63329c..88b65a2008 100644
--- a/cpukit/httpd/misc.c
+++ b/cpukit/httpd/misc.c
@@ -59,10 +59,10 @@ static void	put_ulong(strbuf_t *buf, unsigned long int value, int base,
 /************************************ Code ************************************/
 /*
  *	"basename" returns a pointer to the last component of a pathname
- *  LINUX and LynxOS have their own basename function
+ *  LINUX, RTEMS, and LynxOS have their own basename function
  */
 
-#if ! LINUX & ! LYNX
+#if ! LINUX & ! __rtems__ & ! LYNX
 char_t *basename(char_t* name)
 {
 	char_t	*cp;
@@ -83,7 +83,7 @@ char_t *basename(char_t* name)
 		return ++cp;
 	}
 }
-#endif /* ! LINUX & ! LYNX */
+#endif /* ! LINUX && ! __rtems__ && ! LYNX */
 
 /******************************************************************************/
 /*
diff --git a/cpukit/httpd/uemf.h b/cpukit/httpd/uemf.h
index 1c0d348256..31421a1af4 100644
--- a/cpukit/httpd/uemf.h
+++ b/cpukit/httpd/uemf.h
@@ -47,7 +47,7 @@
 	#include	<stdio.h>
 #endif
 
-#if LINUX
+#if LINUX || __rtems__
 	#include	<sys/types.h>
 	#include	<sys/stat.h>
 	#include	<sys/param.h>
@@ -513,7 +513,7 @@ typedef int		(*socketAccept_t)(int sid, char *ipaddr, int port);
 
 /******************************* Per O/S Defines ******************************/
 
-#if VXW486 || LINUX || LYNX
+#if VXW486 || LINUX || __rtems__ || LYNX
 #ifndef O_BINARY
 #define O_BINARY 		0
 #endif
@@ -569,7 +569,7 @@ extern char *bstrdupA(B_ARGS_DEC, char *s);
 #endif /* UNICODE */
 #endif /* BALLOC */
 
-#if !LINUX
+#if !LINUX && !__rtems__
 extern char_t*	basename(char_t* name);
 #endif
 
-- 
cgit v1.2.3