summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-09-28 19:11:35 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-09-28 19:11:35 +0000
commit5ff9c0886a5d0d82019b61f0b85c3ba21c32222c (patch)
tree4ebe4d894973787d45a6f7dfd2c00470cd04f487 /c/src
parent2000-09-25 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-5ff9c0886a5d0d82019b61f0b85c3ba21c32222c.tar.bz2
2000-09-28 Joel Sherrill <joel@OARcorp.com>
* rtems_webserver/Makefile.am, rtems_webserver/base64.c, rtems_webserver/base64.c: Renamed base64.c to wbase64.c. * rtems_webserver/sock.c: Added file missed in merger.
Diffstat (limited to 'c/src')
-rw-r--r--c/src/exec/libnetworking/ChangeLog6
-rw-r--r--c/src/libnetworking/ChangeLog6
-rw-r--r--c/src/libnetworking/rtems_webserver/Makefile.am8
-rw-r--r--c/src/libnetworking/rtems_webserver/wbase64.c (renamed from c/src/libnetworking/rtems_webserver/base64.c)0
4 files changed, 16 insertions, 4 deletions
diff --git a/c/src/exec/libnetworking/ChangeLog b/c/src/exec/libnetworking/ChangeLog
index fbecc31cc0..58e4ac234e 100644
--- a/c/src/exec/libnetworking/ChangeLog
+++ b/c/src/exec/libnetworking/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-28 Joel Sherrill <joel@OARcorp.com>
+
+ * rtems_webserver/Makefile.am, rtems_webserver/base64.c,
+ rtems_webserver/base64.c: Renamed base64.c to wbase64.c.
+ * rtems_webserver/sock.c: Added file missed in merger.
+
2000-09-22 Joel Sherrill <joel@OARcorp.com>
* machine/types.h, pppd/pppd.h, rtems/rtems_bsdnet_internal.h,
diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog
index fbecc31cc0..58e4ac234e 100644
--- a/c/src/libnetworking/ChangeLog
+++ b/c/src/libnetworking/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-28 Joel Sherrill <joel@OARcorp.com>
+
+ * rtems_webserver/Makefile.am, rtems_webserver/base64.c,
+ rtems_webserver/base64.c: Renamed base64.c to wbase64.c.
+ * rtems_webserver/sock.c: Added file missed in merger.
+
2000-09-22 Joel Sherrill <joel@OARcorp.com>
* machine/types.h, pppd/pppd.h, rtems/rtems_bsdnet_internal.h,
diff --git a/c/src/libnetworking/rtems_webserver/Makefile.am b/c/src/libnetworking/rtems_webserver/Makefile.am
index 3b99ffa0ad..3870951683 100644
--- a/c/src/libnetworking/rtems_webserver/Makefile.am
+++ b/c/src/libnetworking/rtems_webserver/Makefile.am
@@ -7,10 +7,10 @@ AUTOMAKE_OPTIONS = foreign 1.4
LIBNAME = lib.a
LIB = $(ARCH)/$(LIBNAME)
-C_FILES = asp.c balloc.c base64.c default.c ejlex.c ejparse.c emfdb.c form.c \
+C_FILES = asp.c balloc.c default.c ejlex.c ejparse.c emfdb.c form.c \
h.c handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c security.c \
- socket.c sym.c uemf.c um.c url.c value.c webrom.c webs.c websuemf.c \
- webmain.c
+ sock.c socket.c sym.c uemf.c um.c url.c value.c wbase64.c webrom.c webs.c \
+ websuemf.c webmain.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
OBJS = $(C_O_FILES)
@@ -53,7 +53,7 @@ endif
EXTRA_DIST = asp.c balloc.c default.c ej.h ejlex.c ejparse.c form.c h.c \
handler.c mime.c misc.c ringq.c rom.c rtems_webserver.h security.c \
- socket.c sym.c uemf.c uemf.h um.h url.c value.c base64.c webcomp.c \
+ sock.c socket.c sym.c uemf.c uemf.h um.h url.c value.c wbase64.c webcomp.c \
webmain.c webpage.c webrom.c webs.c webs.h websuemf.c wsIntrn.h
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/rtems_webserver/base64.c b/c/src/libnetworking/rtems_webserver/wbase64.c
index b1eb6b01c5..b1eb6b01c5 100644
--- a/c/src/libnetworking/rtems_webserver/base64.c
+++ b/c/src/libnetworking/rtems_webserver/wbase64.c