Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d	(revision 323498)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d	(revision 323499)
@@ -1,138 +1,135 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #pragma D option quiet
 
-inline int AF_INET = 2;
-inline int AF_INET6 = 28;
-
 in_addr_t *ip4a;
 in_addr_t *ip4b;
 in_addr_t *ip4c;
 in_addr_t *ip4d;
 struct in6_addr *ip6a;
 struct in6_addr *ip6b;
 struct in6_addr *ip6c;
 struct in6_addr *ip6d;
 struct in6_addr *ip6e;
 struct in6_addr *ip6f;
 struct in6_addr *ip6g;
 struct in6_addr *ip6h;
 
 BEGIN
 {
 	this->buf4a = alloca(sizeof (in_addr_t));
 	this->buf4b = alloca(sizeof (in_addr_t));
 	this->buf4c = alloca(sizeof (in_addr_t));
 	this->buf4d = alloca(sizeof (in_addr_t));
 	this->buf6a = alloca(sizeof (struct in6_addr));
 	this->buf6b = alloca(sizeof (struct in6_addr));
 	this->buf6c = alloca(sizeof (struct in6_addr));
 	this->buf6d = alloca(sizeof (struct in6_addr));
 	this->buf6e = alloca(sizeof (struct in6_addr));
 	this->buf6f = alloca(sizeof (struct in6_addr));
 	this->buf6g = alloca(sizeof (struct in6_addr));
 	this->buf6h = alloca(sizeof (struct in6_addr));
 	ip4a = this->buf4a;
 	ip4b = this->buf4b;
 	ip4c = this->buf4c;
 	ip4d = this->buf4d;
 	ip6a = this->buf6a;
 	ip6b = this->buf6b;
 	ip6c = this->buf6c;
 	ip6d = this->buf6d;
 	ip6e = this->buf6e;
 	ip6f = this->buf6f;
 	ip6g = this->buf6g;
 	ip6h = this->buf6h;
 
 	*ip4a = htonl(0xc0a80117);
 	*ip4b = htonl(0x7f000001);
 	*ip4c = htonl(0xffffffff);
 	*ip4d = htonl(0x00000000);
 	ip6a->__u6_addr.__u6_addr8[0] = 0xfe;
 	ip6a->__u6_addr.__u6_addr8[1] = 0x80;
 	ip6a->__u6_addr.__u6_addr8[8] = 0x02;
 	ip6a->__u6_addr.__u6_addr8[9] = 0x14;
 	ip6a->__u6_addr.__u6_addr8[10] = 0x4f;
 	ip6a->__u6_addr.__u6_addr8[11] = 0xff;
 	ip6a->__u6_addr.__u6_addr8[12] = 0xfe;
 	ip6a->__u6_addr.__u6_addr8[13] = 0x0b;
 	ip6a->__u6_addr.__u6_addr8[14] = 0x76;
 	ip6a->__u6_addr.__u6_addr8[15] = 0xc8;
 	ip6b->__u6_addr.__u6_addr8[0] = 0x10;
 	ip6b->__u6_addr.__u6_addr8[1] = 0x80;
 	ip6b->__u6_addr.__u6_addr8[10] = 0x08;
 	ip6b->__u6_addr.__u6_addr8[11] = 0x08;
 	ip6b->__u6_addr.__u6_addr8[13] = 0x20;
 	ip6b->__u6_addr.__u6_addr8[13] = 0x0c;
 	ip6b->__u6_addr.__u6_addr8[14] = 0x41;
 	ip6b->__u6_addr.__u6_addr8[15] = 0x7a;
 	ip6c->__u6_addr.__u6_addr8[15] = 0x01;
 	ip6e->__u6_addr.__u6_addr8[12] = 0x7f;
 	ip6e->__u6_addr.__u6_addr8[15] = 0x01;
 	ip6f->__u6_addr.__u6_addr8[10] = 0xff;
 	ip6f->__u6_addr.__u6_addr8[11] = 0xff;
 	ip6f->__u6_addr.__u6_addr8[12] = 0x7f;
 	ip6f->__u6_addr.__u6_addr8[15] = 0x01;
 	ip6g->__u6_addr.__u6_addr8[10] = 0xff;
 	ip6g->__u6_addr.__u6_addr8[11] = 0xfe;
 	ip6g->__u6_addr.__u6_addr8[12] = 0x7f;
 	ip6g->__u6_addr.__u6_addr8[15] = 0x01;
 	ip6h->__u6_addr.__u6_addr8[0] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[1] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[2] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[3] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[4] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[5] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[6] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[7] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[8] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[9] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[10] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[11] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[12] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[13] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[14] = 0xff;
 	ip6h->__u6_addr.__u6_addr8[15] = 0xff;
 
 	printf("%s\n", inet_ntop(AF_INET, ip4a));
 	printf("%s\n", inet_ntop(AF_INET, ip4b));
 	printf("%s\n", inet_ntop(AF_INET, ip4c));
 	printf("%s\n", inet_ntop(AF_INET, ip4d));
 	printf("%s\n", inet_ntop(AF_INET6, ip6a));
 	printf("%s\n", inet_ntop(AF_INET6, ip6b));
 	printf("%s\n", inet_ntop(AF_INET6, ip6c));
 	printf("%s\n", inet_ntop(AF_INET6, ip6d));
 	printf("%s\n", inet_ntop(AF_INET6, ip6e));
 	printf("%s\n", inet_ntop(AF_INET6, ip6f));
 	printf("%s\n", inet_ntop(AF_INET6, ip6g));
 	printf("%s\n", inet_ntop(AF_INET6, ip6h));
 
 	exit(0);
 }