X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2Fhmacros.i4;h=123b8a3bcc63e5c5d21cca2bdd72456ea4b595bb;hp=ff8620ec214eed253812a37b717b4ac7e110242b;hb=fcf2b4e1faf22accb6184cca595aaee602839868;hpb=5c6cd9e070869430d1833751512d47300599f54c diff --git a/regress/hmacros.i4 b/regress/hmacros.i4 index ff8620e..123b8a3 100644 --- a/regress/hmacros.i4 +++ b/regress/hmacros.i4 @@ -3,14 +3,15 @@ m4_dnl (part of complex test harness, not of the library) m4_dnl - common macros m4_dnl This file is part of adns, which is -m4_dnl Copyright (C) 1997-2000,2003,2006 Ian Jackson +m4_dnl Copyright (C) 1997-2000,2003,2006,2014-2016 Ian Jackson +m4_dnl Copyright (C) 2014 Mark Wooding m4_dnl Copyright (C) 1999-2000,2003,2006 Tony Finch m4_dnl Copyright (C) 1991 Massachusetts Institute of Technology m4_dnl (See the file INSTALL for full details.) m4_dnl m4_dnl This program is free software; you can redistribute it and/or modify m4_dnl it under the terms of the GNU General Public License as published by -m4_dnl the Free Software Foundation; either version 2, or (at your option) +m4_dnl the Free Software Foundation; either version 3, or (at your option) m4_dnl any later version. m4_dnl m4_dnl This program is distributed in the hope that it will be useful, @@ -19,8 +20,7 @@ m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the m4_dnl GNU General Public License for more details. m4_dnl m4_dnl You should have received a copy of the GNU General Public License -m4_dnl along with this program; if not, write to the Free Software Foundation, -m4_dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +m4_dnl along with this program; if not, write to the Free Software Foundation. m4_define(`hm_args_massage', `m4_ifelse( @@ -99,7 +99,7 @@ m4_define(`hm_create_hqcall_init',` m4_define(`hm_arg_socktype',` Tmust("$1","$'`1",$'`1==SOCK_STREAM || $'`1==SOCK_DGRAM);') m4_define(`hm_arg_addrfam',` - Tmust("$1","$'`1",$'`1==PF_INET || $'`1==PF_INET6);') + Tmust("$1","$'`1",$'`1==AF_INET || $'`1==AF_INET6);') m4_define(`hm_arg_fcntl_cmd_arg',` Tmust("$1","$'`1",$'`1==F_SETFL || $'`1==F_GETFL); if ($'`1 == F_SETFL) {