diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2006-09-01 21:16:19 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2006-09-01 21:16:19 +0000 |
| commit | d8f86d925a880cbfbe52b0777c891f3c78e1b2f4 (patch) | |
| tree | 8d3db440ea7fad5c555e6efca16f5e34dfa0a156 /cpukit | |
| parent | *** empty log message *** (diff) | |
| download | rtems-d8f86d925a880cbfbe52b0777c891f3c78e1b2f4.tar.bz2 | |
* pppd/rtems.main.c, pppd/pppd.h: renamed 'untimeout'
to 'pppuntimeout' to avoid name clash with [future]
bsdnet kernel routine.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/pppd/pppd.h | 2 | ||||
| -rw-r--r-- | cpukit/pppd/rtemsmain.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 9cf31ce755..5b0fc27c77 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2006-09-01 Till Straumann <strauman@slac.stanford.edu> + + * pppd/rtems.main.c, pppd/pppd.h: renamed 'untimeout' + to 'pppuntimeout' to avoid name clash with [future] + bsdnet kernel routine. + 2006-09-01 Joel Sherrill <joel@OARcorp.com> * libcsupport/src/malloc.c, libnetworking/rtems/rtems_glue.c, diff --git a/cpukit/pppd/pppd.h b/cpukit/pppd/pppd.h index 95d40b82ba..5551bf754f 100644 --- a/cpukit/pppd/pppd.h +++ b/cpukit/pppd/pppd.h @@ -293,7 +293,7 @@ void quit __P((void)); /* like die(1) */ void novm __P((char *)); /* Say we ran out of memory, and die */ void ppptimeout __P((void (*func)(void *), void *arg, int t)); /* Call func(arg) after t seconds */ -void untimeout __P((void (*func)(void *), void *arg)); +void pppuntimeout __P((void (*func)(void *), void *arg)); /* Cancel call to func(arg) */ void update_link_stats __P((int)); /* Get stats at link termination */ void new_phase __P((int)); /* signal start of new phase */ diff --git a/cpukit/pppd/rtemsmain.c b/cpukit/pppd/rtemsmain.c index 4180453555..f2284d866f 100644 --- a/cpukit/pppd/rtemsmain.c +++ b/cpukit/pppd/rtemsmain.c @@ -789,7 +789,7 @@ ppptimeout(func, arg, time) * untimeout - Unschedule a timeout. */ void -untimeout(func, arg) +pppuntimeout(func, arg) void (*func) __P((void *)); void *arg; { |