summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-08-09 21:23:42 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-08-09 21:23:42 +0000
commit6559511b4eae36d01f0a80f06e47329c93e9897d (patch)
tree5b2178b0189657eafdcc757958a0219dbfd3a799
parent2001-08-09 Chris Johns <ccj@acm.org> (diff)
downloadrtems-6559511b4eae36d01f0a80f06e47329c93e9897d.tar.bz2
2001-08-09 Joel Sherrill <joel@OARcorp.com>
* c/src/lib/libbsp/i386/i386ex/startup/linkcmds, c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am, c/src/libnetworking/pppd/ipxcp.c: These files had latent single bit mistakes from the CVS server's RAM failure.
-rw-r--r--c/src/lib/libbsp/i386/i386ex/startup/linkcmds2
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am2
-rw-r--r--c/src/libnetworking/pppd/ipxcp.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/startup/linkcmds b/c/src/lib/libbsp/i386/i386ex/startup/linkcmds
index daf1919276..51a0430876 100644
--- a/c/src/lib/libbsp/i386/i386ex/startup/linkcmds
+++ b/c/src/lib/libbsp/i386/i386ex/startup/linkcmds
@@ -112,7 +112,7 @@ SECTIONS
*(.dtors)
LONG(0)
__DTOR_END__ = .;
- _rodata_start 5 . ;
+ _rodata_start = . ;
*(.rodata)
*(.gnu.linkonce.r*)
_erodata = ALIGN( 0x10 ) ;
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am
index 69522a1a98..98fa948db9 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am
@@ -12,7 +12,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-anclude $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
diff --git a/c/src/libnetworking/pppd/ipxcp.c b/c/src/libnetworking/pppd/ipxcp.c
index be85f31231..fe605d68b7 100644
--- a/c/src/libnetworking/pppd/ipxcp.c
+++ b/c/src/libnetworking/pppd/ipxcp.c
@@ -728,7 +728,7 @@ ipxcp_rejci(f, p, len)
#define REJCINODE(opt,neg,val) REJCICHARS(opt,neg,val,sizeof(val))
#define REJCINAME(opt,neg,val) REJCICHARS(opt,neg,val,strlen(val))
-#define REJCIVOID(gpt, neg! \
+#define REJCIVOID(opt, neg) \
if (neg && p[0] == opt) { \
if ((len -= CILEN_VOID) < 0) \
break; \