From owner-svn-src-head@FreeBSD.ORG  Fri Jul  5 19:26:02 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5DBFBBA4;
 Fri,  5 Jul 2013 19:26:02 +0000 (UTC) (envelope-from rmh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4E4631E7F;
 Fri,  5 Jul 2013 19:26:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65JQ21G048981;
 Fri, 5 Jul 2013 19:26:02 GMT (envelope-from rmh@svn.freebsd.org)
Received: (from rmh@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65JQ1Ls048979;
 Fri, 5 Jul 2013 19:26:01 GMT (envelope-from rmh@svn.freebsd.org)
Message-Id: <201307051926.r65JQ1Ls048979@svn.freebsd.org>
From: Robert Millan <rmh@FreeBSD.org>
Date: Fri, 5 Jul 2013 19:26:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252826 - head/usr.sbin/ppp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 19:26:02 -0000

Author: rmh
Date: Fri Jul  5 19:26:01 2013
New Revision: 252826
URL: http://svnweb.freebsd.org/changeset/base/252826

Log:
  Remove ancient code for FreeBSD 2.x compatibility.
  
  Reviewed by: brian, freebsd-net

Modified:
  head/usr.sbin/ppp/defs.c
  head/usr.sbin/ppp/defs.h

Modified: head/usr.sbin/ppp/defs.c
==============================================================================
--- head/usr.sbin/ppp/defs.c	Fri Jul  5 19:11:12 2013	(r252825)
+++ head/usr.sbin/ppp/defs.c	Fri Jul  5 19:26:01 2013	(r252826)
@@ -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
 

Modified: head/usr.sbin/ppp/defs.h
==============================================================================
--- head/usr.sbin/ppp/defs.h	Fri Jul  5 19:11:12 2013	(r252825)
+++ head/usr.sbin/ppp/defs.h	Fri Jul  5 19:26:01 2013	(r252826)
@@ -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