X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fhmacros.i4;h=6f52787ffd166cc322cd79f50d198c8a508bdfc3;hb=1674b67241faf969d9148eca8148a82d2ad540c3;hp=4e5123ec4a4476946ce18a80285d419c8cac5776;hpb=70a778e57fbc29a2d2bc8976745a18f4edd1a03a;p=adns.git

diff --git a/regress/hmacros.i4 b/regress/hmacros.i4
index 4e5123e..6f52787 100644
--- a/regress/hmacros.i4
+++ b/regress/hmacros.i4
@@ -2,7 +2,12 @@ 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, 1998 Ian Jackson
+m4_dnl  This file is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl
+m4_dnl  It is part of adns, which is
+m4_dnl    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl    Copyright (C) 1999 Tony Finch <dot@dotat.at>
 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
@@ -35,10 +40,10 @@ m4_define(`hm_args_massage',
 
 m4_define(`hm_create_nothing', `
  m4_define(`hm_na',`')
- m4_define(`hm_arg_timeval_out_abs', `')
  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',`')
@@ -53,10 +58,10 @@ m4_define(`hm_create_nothing', `
 
 m4_define(`hm_create_proto_h',`
  m4_define(`hm_na', `hm_comma')
- m4_define(`hm_arg_timeval_out_abs', `struct timeval *$'`1')
  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,9 +76,9 @@ m4_define(`hm_create_proto_h',`
 
 m4_define(`hm_create_proto_q',`
  hm_create_proto_h
- m4_define(`hm_arg_timeval_out_abs', `')
  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,10 +109,10 @@ m4_define(`hm_create_hqcall_init',`
 
 m4_define(`hm_create_realcall_args',`
  m4_define(`hm_na',`hm_comma')
- m4_define(`hm_arg_timeval_out_abs', `$'`1')
  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')
@@ -122,7 +127,6 @@ m4_define(`hm_create_realcall_args',`
 
 m4_define(`hm_create_hqcall_args',`
  hm_create_realcall_args
- m4_define(`hm_arg_timeval_out_abs', `')
  m4_define(`hm_arg_nullptr', `')
  m4_define(`hm_arg_must', `')
  m4_define(`hm_arg_ign', `')