Adding propper include guard to header files, renaming to PPP_<FILE>_H for consistency

[ppp.git] / pppd / eui64.h

diff --git a/pppd/eui64.h b/pppd/eui64.h
index 496814d17b3b4557725da8d85b4cf4a30efcaf80..f29200b818d7efd0fbfb1e2914a39255f99954b6 100644 (file)
--- a/pppd/eui64.h
+++ b/pppd/eui64.h
@@ -33,47 +33,15 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+#ifndef PPP_EUI64_H
+#define PPP_EUI64_H
 
 #include "pppdconf.h"
 
-#ifndef __EUI64_H__
-#define __EUI64_H__
-
 #if !defined(PPP_WITH_IPV6CP)
 #error "this file should only be included when PPP_WITH_IPV6CP is defined"
 #endif /* not defined(PPP_WITH_IPV6CP) */
 
-#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
-
-#else /* else if not defined(SOL2) */
-
-/*
- * 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) */
-
 #define eui64_iszero(e)                (((e).e32[0] | (e).e32[1]) == 0)
 #define eui64_equals(e, o)     (((e).e32[0] == (o).e32[0]) && \
                                ((e).e32[1] == (o).e32[1]))
@@ -111,5 +79,4 @@ typedef union
 
 char *eui64_ntoa(eui64_t);     /* Returns ascii representation of id */
 
-#endif /* __EUI64_H__ */
-
+#endif /* PPP_EUI64_H */