aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/ppp
diff options
context:
space:
mode:
authorRobert Millan <rmh@FreeBSD.org>2013-07-05 19:26:01 +0000
committerRobert Millan <rmh@FreeBSD.org>2013-07-05 19:26:01 +0000
commitfe24bdd45e282240f73139e775cda913a8810fb1 (patch)
treebe11ff7a94a0e81d4c153ed562f15921d3288377 /usr.sbin/ppp
parent52c2fbe8a9f7ba4d524d2de2cc95fabfd2ebaaa6 (diff)
downloadsrc-fe24bdd45e282240f73139e775cda913a8810fb1.tar.gz
src-fe24bdd45e282240f73139e775cda913a8810fb1.zip
Remove ancient code for FreeBSD 2.x compatibility.
Reviewed by: brian, freebsd-net
Notes
Notes: svn path=/head/; revision=252826
Diffstat (limited to 'usr.sbin/ppp')
-rw-r--r--usr.sbin/ppp/defs.c13
-rw-r--r--usr.sbin/ppp/defs.h2
2 files changed, 3 insertions, 12 deletions
diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c
index dcd9e47e1a19..856c200e02d7 100644
--- a/usr.sbin/ppp/defs.c
+++ b/usr.sbin/ppp/defs.c
@@ -43,7 +43,7 @@
#include <sys/module.h>
#endif
#include <termios.h>
-#if !defined(__FreeBSD__) || __FreeBSD__ < 3
+#ifndef __FreeBSD__
#include <time.h>
#endif
#include <unistd.h>
@@ -56,20 +56,11 @@
#define issep(c) ((c) == '\t' || (c) == ' ')
-#if defined(__NetBSD__) || __FreeBSD__ < 3
+#ifdef __NetBSD__
void
randinit()
{
-#if defined(__FreeBSD__)
- static int initdone; /* srandomdev() call is only required once */
-
- if (!initdone) {
- initdone = 1;
- srandomdev();
- }
-#else
srandom((time(NULL)^getpid())+random());
-#endif
}
#endif
diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h
index d7cc799362f4..d320a53729b7 100644
--- a/usr.sbin/ppp/defs.h
+++ b/usr.sbin/ppp/defs.h
@@ -117,7 +117,7 @@
#define ROUNDUP(x) ((x) ? (1 + (((x) - 1) | (sizeof(long) - 1))) : sizeof(long))
-#if defined(__NetBSD__) || __FreeBSD__ < 3
+#ifdef __NetBSD__
extern void randinit(void);
#else
#define random arc4random