summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmh <rmh@FreeBSD.org>2013-07-05 19:26:01 +0000
committerrmh <rmh@FreeBSD.org>2013-07-05 19:26:01 +0000
commitf00a060f04f6e177a5ee03ef9d1b1951505096cf (patch)
treebe11ff7a94a0e81d4c153ed562f15921d3288377
parentc6b0e8332430c1189a711b8ce2176b61c141c7bc (diff)
downloadFreeBSD-src-f00a060f04f6e177a5ee03ef9d1b1951505096cf.zip
FreeBSD-src-f00a060f04f6e177a5ee03ef9d1b1951505096cf.tar.gz
Remove ancient code for FreeBSD 2.x compatibility.
Reviewed by: brian, freebsd-net
-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 dcd9e47..856c200 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 d7cc799..d320a53 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
OpenPOWER on IntegriCloud