X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Feui64.h;h=f29200b818d7efd0fbfb1e2914a39255f99954b6;hb=509f04959ad891d7f981f035ed461d51bd1f74b0;hp=0f6b6fd46647aa05ab2b6b6e35fd823bc77ef91a;hpb=f53a48eb9d74db3c71938e114b7f489c339bc003;p=ppp.git

diff --git a/pppd/eui64.h b/pppd/eui64.h
index 0f6b6fd..f29200b 100644
--- a/pppd/eui64.h
+++ b/pppd/eui64.h
@@ -32,46 +32,15 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: eui64.h,v 1.6 2002/12/04 23:03:32 paulus Exp $
-*/
-
-#ifndef __EUI64_H__
-#define __EUI64_H__
-
-#if !defined(INET6)
-#error	"this file should only be included when INET6 is defined"
-#endif /* not defined(INET6) */
-
-#if defined(SOL2)
-#include <netinet/in.h>
-
-typedef union {
-    uint8_t	e8[8];		/* lower 64-bit IPv6 address */
-    uint32_t	e32[2];		/* lower 64-bit IPv6 address */
-} eui64_t;
-
-/*
- * Declare the two below, since in.h only defines them when _KERNEL
- * is declared - which shouldn't be true when dealing with user-land programs
  */
-#define	s6_addr8	_S6_un._S6_u8
-#define	s6_addr32	_S6_un._S6_u32
+#ifndef PPP_EUI64_H
+#define PPP_EUI64_H
 
-#else /* else if not defined(SOL2) */
+#include "pppdconf.h"
 
-/*
- * TODO:
- *
- * Maybe this should be done by processing struct in6_addr directly...
- */
-typedef union
-{
-    u_int8_t e8[8];
-    u_int16_t e16[4];
-    u_int32_t e32[2];
-} eui64_t;
-
-#endif /* defined(SOL2) */
+#if !defined(PPP_WITH_IPV6CP)
+#error	"this file should only be included when PPP_WITH_IPV6CP is defined"
+#endif /* not defined(PPP_WITH_IPV6CP) */
 
 #define eui64_iszero(e)		(((e).e32[0] | (e).e32[1]) == 0)
 #define eui64_equals(e, o)	(((e).e32[0] == (o).e32[0]) && \
@@ -108,7 +77,6 @@ typedef union
 				} while (0)
 #define eui64_setlo32(e, l)	eui64_set32(e, l)
 
-char *eui64_ntoa __P((eui64_t));	/* Returns ascii representation of id */
-
-#endif /* __EUI64_H__ */
+char *eui64_ntoa(eui64_t);	/* Returns ascii representation of id */
 
+#endif /* PPP_EUI64_H */