Re: AIX net/if_arp.h include fix for struct fc_softc

[Bruce Korb <bkorb@gnu.org>]

On 06/05/11 21:16, Peter O'Gorman wrote:
> Ok for trunk?
>
> Peter

> Index: ChangeLog
> ===================================================================
> --- ChangeLog	(revision 174678)
> 2011-??-??  Peter O'Gorman  <pogma@thewrittenword.com>
>
> 	* inclhack.def (aix_net_if_arp): New fix.
> 	* fixincl.x: Regenerate.
> 	* tests/base/net/if_arp.h [AIX_NET_IF_ARP_CHECK]: New test.
>
> Index: inclhack.def
> ===================================================================
> --- inclhack.def	(revision 174678)
> +++ inclhack.def	(working copy)
> @@ -369,6 +369,19 @@
>      test_text = "#define _Complex_I	__I\n";
>  };
>
> +/*
> + * net/if_arp.h defines a variable fc_softc instead of adding a
> + * typedef for the struct on AIX 5.2, 5.3, 6.1 and 7.1
> + */
> +fix = {
> +    hackname  = aix_net_if_arp;
> +    mach      = "*-*-aix*";
> +    files     = "net/if_arp.h";
> +    select    = "^struct  fc_softc \\{";
> +    c_fix     = format;
> +    c_fix_arg = "typedef struct _fc_softc {";
> +    test_text = "struct  fc_softc {";
> +};
>
>  /*
>   *  pthread.h on AIX 4.3.3 tries to define a macro without whitspace

Please be kind enough to make the test text sample be a complete
struct, even if it only has one "int" field.  Aesthetics.  Sorry.
The change log showed a change for tests/base/net/if_arp.h, but
the patch did not.

Otherwise, fine by me.