From: Paul Mackerras <paulus@samba.org>
Date: Thu, 10 Aug 1995 06:49:35 +0000 (+0000)
Subject: Protect against problems if bitypes.h from BIND distribution is included.
X-Git-Tag: RELEASE_2_3_6~635
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=50659b2e7cdfa0e3be36a6b4753dcca28c57f1e6

Protect against problems if bitypes.h from BIND distribution is included.
---

diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h
index 3e2f9a7..77f01bb 100644
--- a/include/net/ppp_defs.h
+++ b/include/net/ppp_defs.h
@@ -1,4 +1,4 @@
-/*	$Id: ppp_defs.h,v 1.6 1995/04/24 02:42:06 paulus Exp $	*/
+/*	$Id: ppp_defs.h,v 1.7 1995/08/10 06:49:35 paulus Exp $	*/
 
 /*
  * ppp_defs.h - PPP definitions.
@@ -74,7 +74,7 @@
 /*
  * A 32-bit unsigned integral type.
  */
-#ifndef __BIT_TYPES_DEFINED__
+#if !defined(__BIT_TYPES_DEFINED__) && !defined(_BITYPES)
 #ifdef	UINT32_T
 typedef UINT32_T	u_int32_t;
 #else