[src/trunk]: src/external/bsd/dhcp Undo horrid configure hack, use compiler d...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aef7839a29a6
branches:  trunk
changeset: 785693:aef7839a29a6
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Mar 25 01:11:02 2013 +0000

description:
Undo horrid configure hack, use compiler define.

diffstat:

 external/bsd/dhcp/dist/common/icmp.c |  6 +++---
 external/bsd/dhcp/include/config.h   |  2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 01d08475e884 -r aef7839a29a6 external/bsd/dhcp/dist/common/icmp.c
--- a/external/bsd/dhcp/dist/common/icmp.c      Sun Mar 24 23:04:07 2013 +0000
+++ b/external/bsd/dhcp/dist/common/icmp.c      Mon Mar 25 01:11:02 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icmp.c,v 1.1.1.1 2013/03/24 15:45:53 christos Exp $    */
+/*     $NetBSD: icmp.c,v 1.2 2013/03/25 01:11:02 christos Exp $        */
 
 /* dhcp.c
 
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: icmp.c,v 1.1.1.1 2013/03/24 15:45:53 christos Exp $");
+__RCSID("$NetBSD: icmp.c,v 1.2 2013/03/25 01:11:02 christos Exp $");
 
 #include "dhcpd.h"
 #include "netinet/ip.h"
@@ -164,7 +164,7 @@
        icmp.icmp_code = 0;
        icmp.icmp_cksum = 0;
        icmp.icmp_seq = 0;
-#if SIZEOF_STRUCT_IADDR_P == 8
+#ifdef _LP64
        icmp.icmp_id = (((u_int32_t)(u_int64_t)addr) ^
                        (u_int32_t)(((u_int64_t)addr) >> 32));
 #else
diff -r 01d08475e884 -r aef7839a29a6 external/bsd/dhcp/include/config.h
--- a/external/bsd/dhcp/include/config.h        Sun Mar 24 23:04:07 2013 +0000
+++ b/external/bsd/dhcp/include/config.h        Mon Mar 25 01:11:02 2013 +0000
@@ -136,7 +136,7 @@
 /* #undef SECS_BYTEORDER */
 
 /* The size of `struct iaddr *', as computed by sizeof. */
-#define SIZEOF_STRUCT_IADDR_P 8
+/* #undef SIZEOF_STRUCT_IADDR_P */
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1