From e1d553c77d0696c87302c5d1659dca3cae8971b2 Mon Sep 17 00:00:00 2001 From: Henning Brauer Date: Mon, 23 Feb 2004 20:16:01 +0000 Subject: goodbye VOIDPTR --- sbin/dhclient/dhcpd.h | 6 +++--- sbin/dhclient/osdep.h | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'sbin/dhclient') diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 70a57f7692e..72cf857999c 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.9 2004/02/23 20:09:02 deraadt Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.10 2004/02/23 20:16:00 henning Exp $ */ /* Definitions for dhcpd... */ @@ -492,8 +492,8 @@ struct tree *tree_limit(struct tree *, int); int tree_evaluate(struct tree_cache *); /* alloc.c */ -VOIDPTR dmalloc(int, char *); -void dfree(VOIDPTR, char *); +void *dmalloc(int, char *); +void dfree(void *, char *); struct packet *new_packet(char *); struct dhcp_packet *new_dhcp_packet(char *); struct tree *new_tree(char *); diff --git a/sbin/dhclient/osdep.h b/sbin/dhclient/osdep.h index b89c2de762d..4faeab195b7 100644 --- a/sbin/dhclient/osdep.h +++ b/sbin/dhclient/osdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: osdep.h,v 1.11 2004/02/23 20:13:33 henning Exp $ */ +/* $OpenBSD: osdep.h,v 1.12 2004/02/23 20:16:00 henning Exp $ */ /* Operating system dependencies... */ @@ -64,7 +64,6 @@ extern int h_errno; #include #define EOL '\n' -#define VOIDPTR void * #if !defined (TIME_MAX) # define TIME_MAX 2147483647 -- cgit v1.2.3