Fixup in merge/rebase, had to remove duplicate use of pppdconf.h

[ppp.git] / pppd / eui64.h

diff --git a/pppd/eui64.h b/pppd/eui64.h
index 0f6b6fd46647aa05ab2b6b6e35fd823bc77ef91a..496814d17b3b4557725da8d85b4cf4a30efcaf80 100644 (file)
--- a/pppd/eui64.h
+++ b/pppd/eui64.h
@@ -32,15 +32,16 @@
  * 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 $
-*/
+ */
+
+#include "pppdconf.h"
 
 #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(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>
@@ -108,7 +109,7 @@ typedef union
                                } while (0)
 #define eui64_setlo32(e, l)    eui64_set32(e, l)
 
-char *eui64_ntoa __P((eui64_t));       /* Returns ascii representation of id */
+char *eui64_ntoa(eui64_t);     /* Returns ascii representation of id */
 
 #endif /* __EUI64_H__ */