fix LP64 bug; ura@hiru.aoba.yokohama.jp

1 files changed, 8 insertions, 8 deletions

diff --git a/usr.sbin/dhcp/common/convert.c b/usr.sbin/dhcp/common/convert.c
index c08e9d3a09f..12afe87a40a 100644
--- a/usr.sbin/dhcp/common/convert.c
+++ b/usr.sbin/dhcp/common/convert.c
@@ -46,36 +46,36 @@
 u_int32_t getULong (buf)
 	unsigned char *buf;
 {
-	unsigned long ibuf;
+	u_int32_t ibuf;
 
-	memcpy (&ibuf, buf, sizeof (u_int32_t));
+	memcpy (&ibuf, buf, sizeof (ibuf));
 	return ntohl (ibuf);
 }
 
 int32_t getLong (buf)
 	unsigned char *buf;
 {
-	long ibuf;
+	int32_t ibuf;
 
-	memcpy (&ibuf, buf, sizeof (int32_t));
+	memcpy (&ibuf, buf, sizeof (ibuf));
 	return ntohl (ibuf);
 }
 
 u_int16_t getUShort (buf)
 	unsigned char *buf;
 {
-	unsigned short ibuf;
+	u_int16_t ibuf;
 
-	memcpy (&ibuf, buf, sizeof (u_int16_t));
+	memcpy (&ibuf, buf, sizeof (ibuf));
 	return ntohs (ibuf);
 }
 
 int16_t getShort (buf)
 	unsigned char *buf;
 {
-	short ibuf;
+	int16_t ibuf;
 
-	memcpy (&ibuf, buf, sizeof (int16_t));
+	memcpy (&ibuf, buf, sizeof (ibuf));
 	return ntohs (ibuf);
 }