Changeset be22768 in rtems

Timestamp:

Oct 28, 1999, 2:50:43 PM (21 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

b8d9f41

Parents:

bb43e079

Message:

Added use of rtems rather than LINUX for RTEMS configuration.

Files:

• c/src/libnetworking/rtems_webserver/Makefile.in (modified) (1 diff)
• c/src/libnetworking/rtems_webserver/misc.c (modified) (2 diffs)
• c/src/libnetworking/rtems_webserver/uemf.h (modified) (3 diffs)
• cpukit/httpd/Makefile.in (modified) (1 diff)
• cpukit/httpd/misc.c (modified) (2 diffs)
• cpukit/httpd/uemf.h (modified) (3 diffs)

c/src/libnetworking/rtems_webserver/Makefile.in

@@ -36 +36 @@
 #
 
-DEFINES += -DWEBS -DUEMF -DOS="LINUX" -DLINUX
+DEFINES += -DWEBS -DUEMF -DOS="RTEMS"
 CPPFLAGS +=
 CFLAGS +=

c/src/libnetworking/rtems_webserver/misc.c

@@ -60 +60 @@
 /*
  *      "basename" returns a pointer to the last component of a pathname
- *  LINUX and LynxOS have their own basename function
- */
-
-#if ! LINUX & ! LYNX
+ *  LINUX, RTEMS, and LynxOS have their own basename function
+ */
+
+#if ! LINUX & ! __rtems__ & ! LYNX
 char_t *basename(char_t* name)
 {
@@ -84 +84 @@
         }
 }
-#endif /* ! LINUX & ! LYNX */
+#endif /* ! LINUX && ! __rtems__ && ! LYNX */
 
 /******************************************************************************/

c/src/libnetworking/rtems_webserver/uemf.h

@@ -48 +48 @@
 #endif
 
-#if LINUX
+#if LINUX || __rtems__
         #include        <sys/types.h>
         #include        <sys/stat.h>
@@ -514 +514 @@
 /******************************* Per O/S Defines ******************************/
 
-#if VXW486 || LINUX || LYNX
+#if VXW486 || LINUX || __rtems__ || LYNX
 #ifndef O_BINARY
 #define O_BINARY                0
@@ -570 +570 @@
 #endif /* BALLOC */
 
-#if !LINUX
+#if !LINUX && !__rtems__
 extern char_t*  basename(char_t* name);
 #endif

cpukit/httpd/Makefile.in

@@ -36 +36 @@
 #
 
-DEFINES += -DWEBS -DUEMF -DOS="LINUX" -DLINUX
+DEFINES += -DWEBS -DUEMF -DOS="RTEMS"
 CPPFLAGS +=
 CFLAGS +=

cpukit/httpd/misc.c

@@ -60 +60 @@
 /*
  *      "basename" returns a pointer to the last component of a pathname
- *  LINUX and LynxOS have their own basename function
- */
-
-#if ! LINUX & ! LYNX
+ *  LINUX, RTEMS, and LynxOS have their own basename function
+ */
+
+#if ! LINUX & ! __rtems__ & ! LYNX
 char_t *basename(char_t* name)
 {
@@ -84 +84 @@
         }
 }
-#endif /* ! LINUX & ! LYNX */
+#endif /* ! LINUX && ! __rtems__ && ! LYNX */
 
 /******************************************************************************/

cpukit/httpd/uemf.h

@@ -48 +48 @@
 #endif
 
-#if LINUX
+#if LINUX || __rtems__
         #include        <sys/types.h>
         #include        <sys/stat.h>
@@ -514 +514 @@
 /******************************* Per O/S Defines ******************************/
 
-#if VXW486 || LINUX || LYNX
+#if VXW486 || LINUX || __rtems__ || LYNX
 #ifndef O_BINARY
 #define O_BINARY                0
@@ -570 +570 @@
 #endif /* BALLOC */
 
-#if !LINUX
+#if !LINUX && !__rtems__
 extern char_t*  basename(char_t* name);
 #endif