X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/a719a4bedec2bc512b7f95f7446e02f6662ebbc7..a33a9e25468b6036b702ad32ea1184121b59cb5d:/regress/hmacros.i4 diff --git a/regress/hmacros.i4 b/regress/hmacros.i4 index 3194e03..b6c2d8b 100644 --- a/regress/hmacros.i4 +++ b/regress/hmacros.i4 @@ -2,7 +2,11 @@ m4_dnl hmacros.h.m4 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 Copyright (C) 1997-1999 Ian Jackson +m4_dnl This file is part of adns, which is +m4_dnl Copyright (C) 1997-2000,2003,2006 Ian Jackson +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 @@ -27,10 +31,10 @@ m4_define(`hm_args_massage', `'), `', `$2', - ` + `m4_dnl m4_patsubst(m4_patsubst(m4_patsubst(m4_translit($1, ` ',` '), `\(hm_comma *\)*$', `'), `^\( *hm_comma\)*', `'), - `\( *hm_comma *\)+',` hm_comma ') + `\( *hm_comma *\)+',` hm_comma ')m4_dnl ')') m4_define(`hm_create_nothing', ` @@ -38,6 +42,7 @@ m4_define(`hm_create_nothing', ` m4_define(`hm_arg_nullptr', `') m4_define(`hm_arg_int', `') m4_define(`hm_arg_fdset_io', `') + m4_define(`hm_arg_pollfds_io', `') m4_define(`hm_arg_timeval_in_rel_null',`') m4_define(`hm_arg_must', `') m4_define(`hm_arg_socktype',`') @@ -55,6 +60,7 @@ m4_define(`hm_create_proto_h',` m4_define(`hm_arg_nullptr', `$'`1 $'`2') m4_define(`hm_arg_int', `int $'`1') m4_define(`hm_arg_fdset_io', `fd_set *$'`1') + m4_define(`hm_arg_pollfds_io', `struct pollfd *$'`1 hm_comma int $'`2') m4_define(`hm_arg_timeval_in_rel_null', `struct timeval *$'`1') m4_define(`hm_arg_must', `$'`1 $'`2') m4_define(`hm_arg_socktype', `int $'`1') @@ -71,6 +77,7 @@ m4_define(`hm_create_proto_q',` hm_create_proto_h m4_define(`hm_arg_nullptr', `') m4_define(`hm_arg_fdset_io', `const fd_set *$'`1') + m4_define(`hm_arg_pollfds_io', `const struct pollfd *$'`1 hm_comma int $'`2') m4_define(`hm_arg_must', `') m4_define(`hm_arg_ign', `') m4_define(`hm_arg_fcntl_cmd_arg', `int $'`1 hm_comma long $'`2') @@ -104,6 +111,7 @@ m4_define(`hm_create_realcall_args',` m4_define(`hm_arg_nullptr', `0') m4_define(`hm_arg_int', `$'`1') m4_define(`hm_arg_fdset_io', `$'`1') + m4_define(`hm_arg_pollfds_io', `$'`1 hm_comma $'`2') m4_define(`hm_arg_timeval_in_rel_null', `$'`1') m4_define(`hm_arg_must', `$'`2') m4_define(`hm_arg_socktype', `$'`1')