Module Name: src
Committed By: christos
Date: Mon Mar 25 01:11:03 UTC 2013
Modified Files:
src/external/bsd/dhcp/dist/common: icmp.c
src/external/bsd/dhcp/include: config.h
Log Message:
Undo horrid configure hack, use compiler define.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/dhcp/dist/common/icmp.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcp/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcp/dist/common/icmp.c
diff -u src/external/bsd/dhcp/dist/common/icmp.c:1.1.1.1 src/external/bsd/dhcp/dist/common/icmp.c:1.2
--- src/external/bsd/dhcp/dist/common/icmp.c:1.1.1.1 Sun Mar 24 11:45:53 2013
+++ src/external/bsd/dhcp/dist/common/icmp.c Sun Mar 24 21:11:02 2013
@@ -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 @@ int icmp_echorequest (addr)
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
Index: src/external/bsd/dhcp/include/config.h
diff -u src/external/bsd/dhcp/include/config.h:1.2 src/external/bsd/dhcp/include/config.h:1.3
--- src/external/bsd/dhcp/include/config.h:1.2 Sun Mar 24 19:03:07 2013
+++ src/external/bsd/dhcp/include/config.h Sun Mar 24 21:11:03 2013
@@ -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
