* pppd/rtems.main.c, pppd/pppd.h: renamed 'untimeout'

to 'pppuntimeout' to avoid name clash with [future]
	bsdnet kernel routine.

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,

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 */

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;
 {