This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Fix minor ppp build issues
- From: Jonathan Larmour <jlarmour at jifvik dot org>
- To: ecos-patches at ecos dot sourceware dot org
- Date: Thu, 6 May 2004 14:54:18 +0100
- Subject: Fix minor ppp build issues
This just resolves some inconsistencies with the ppp source.
Jifl
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/ppp/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ChangeLog
--- ChangeLog 21 Apr 2004 08:41:14 -0000 1.3
+++ ChangeLog 6 May 2004 13:51:46 -0000
@@ -1,5 +1,12 @@
+2004-05-06 Jonathan Larmour <jifl@eCosCentric.com>
+
+ * src/auth.c: Don't use non-eCos <paths.h>
+ * src/pppd.c: Don't use non-eCos <sys/wait.h> and <sys/resource.h>
+ * src/sys-ecos.c: netmask must be extern - not all tools have
+ COMMON section support.
+
2004-04-15 Oyvind Harboe <oyvind.harboe@zylin.com>
* src/chat.c: Script now returns success when it runs to completion
2004-03-31 John Dallaway <jld@ecoscentric.com>
Index: src/auth.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/ppp/current/src/Attic/auth.c,v
retrieving revision 1.4
diff -u -5 -p -r1.4 auth.c
--- src/auth.c 23 Sep 2003 20:00:56 -0000 1.4
+++ src/auth.c 6 May 2004 13:51:46 -0000
@@ -88,11 +88,13 @@
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
#include <unistd.h>
#include <cyg/ppp/syslog.h>
+#ifndef __ECOS
#include <paths.h>
+#endif
//#include <pwd.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
Index: src/pppd.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/ppp/current/src/pppd.c,v
retrieving revision 1.7
diff -u -5 -p -r1.7 pppd.c
--- src/pppd.c 22 Dec 2003 09:52:16 -0000 1.7
+++ src/pppd.c 6 May 2004 13:51:47 -0000
@@ -80,13 +80,17 @@
#include <fcntl.h>
#include <cyg/ppp/syslog.h>
#include <sys/param.h>
#include <netdb.h>
#include <sys/types.h>
+#ifndef __ECOS
#include <sys/wait.h>
+#endif
#include <sys/time.h>
+#ifndef __ECOS
#include <sys/resource.h>
+#endif
#include <sys/stat.h>
#include <sys/socket.h>
#define MAXPATHLEN PATH_MAX
Index: src/sys-ecos.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/ppp/current/src/sys-ecos.c,v
retrieving revision 1.10
diff -u -5 -p -r1.10 sys-ecos.c
--- src/sys-ecos.c 21 Apr 2004 08:41:14 -0000 1.10
+++ src/sys-ecos.c 6 May 2004 13:51:47 -0000
@@ -167,11 +167,11 @@ static void wait_input_alarm(cyg_handle_
#ifdef CYGOPT_IO_SERIAL_SUPPORT_LINE_STATUS
void cyg_ppp_serial_callback( cyg_serial_line_status_t *s,
CYG_ADDRWORD priv );
#endif
-u_int32_t netmask; /* IP netmask to set on interface */
+extern u_int32_t netmask; /* IP netmask to set on interface */
//==========================================================================
/*
* sys_init - System-dependent initialization.
*/