From 1fd5135a7be6502d1653b308525604749e10df27 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Tue, 23 Jun 1998 21:58:41 +0000
Subject: Merge ppp 2.3.3 -> 2.3.5 changes (for what it's worth)

---
 usr.bin/chat/chat.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'usr.bin/chat/chat.c')

diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index a7bff26..f3676aa0 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -78,7 +78,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: chat.c,v 1.10 1997/12/29 00:08:52 alex Exp $";
+static char rcsid[] = "$Id: chat.c,v 1.11 1998/03/21 20:47:04 peter Exp $";
 #endif
 
 #include <stdio.h>
@@ -1412,6 +1412,16 @@ register char *string;
     return (0);
 }
 
+/*
+ * Gross kludge to handle Solaris versions >= 2.6 having usleep.
+ */
+#ifdef SOL2
+#include <sys/param.h>
+#if MAXUID > 65536		/* then this is Solaris 2.6 or later */
+#undef NO_USLEEP
+#endif
+#endif /* SOL2 */
+
 #ifdef NO_USLEEP
 #include <sys/types.h>
 #include <sys/time.h>
-- 
cgit v1.1