summaryrefslogtreecommitdiffstats
path: root/cpukit/pppd/pppd.h
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2005-01-20 17:00:38 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2005-01-20 17:00:38 +0000
commit4ca43d72e1e6af22688f868463e4ccf429e3f5c9 (patch)
treef7e2b7d3c7d0a61729e6952b907273df9897f630 /cpukit/pppd/pppd.h
parentCosmetics. (diff)
downloadrtems-4ca43d72e1e6af22688f868463e4ccf429e3f5c9.tar.bz2
2005-01-20 Joel Sherrill <joel@OARcorp.com>
PR 736/pppd * libnetworking/pppd/chat.c, libnetworking/pppd/demand.c, libnetworking/pppd/pppd.h, libnetworking/pppd/rtemsmain.c, libnetworking/pppd/sys-rtems.c, libnetworking/pppd/utils.c: ttyfd should not be static and should have a name more specific to pppd.
Diffstat (limited to 'cpukit/pppd/pppd.h')
-rw-r--r--cpukit/pppd/pppd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpukit/pppd/pppd.h b/cpukit/pppd/pppd.h
index 0ecd2e1d23..ddc5571b23 100644
--- a/cpukit/pppd/pppd.h
+++ b/cpukit/pppd/pppd.h
@@ -141,7 +141,7 @@ extern int pppd_kill_link; /* Signal to terminate processing loop */
extern int hungup; /* Physical layer has disconnected */
extern int pppifunit; /* Interface unit number */
extern char ifname[]; /* Interface name */
-extern int ttyfd; /* Serial device file descriptor */
+extern int pppd_ttyfd; /* Serial device file descriptor */
extern char hostname[]; /* Our hostname */
extern u_char outpacket_buf[]; /* Buffer for outgoing packets */
extern int pppd_phase; /* Current state of link - see values below */
@@ -301,7 +301,7 @@ void new_phase __P((int)); /* signal start of new phase */
/* Procedures exported from utils.c. */
void log_packet __P((u_char *, int, char *, int));
/* Format a packet and log it with syslog */
-void print_string __P((char *, int, void (*) (void *, char *, ...),
+void print_string __P((void *, int, void (*) (void *, char *, ...),
void *)); /* Format a string for output */
int slprintf __P((char *, int, char *, ...)); /* sprintf++ */
int vslprintf __P((char *, int, char *, va_list)); /* vsprintf++ */