[PATCH] xfree86: [v2] Remove duplicate InputInfoPtr typedef from xf86Xinput.h

[Matthieu Herrb]

On Mon, Jul 28, 2014 at 12:09:51PM -0700, Keith Packard wrote:
> GCC 4.2 doesn't accept 2 typedef declarations of the same type, so
> remove the extra one from xf86Xinput.h and have xf86Xinput.h #include
> xf86.h to make sure everyone using just that file gets the typedef.
> 
> Signed-off-by: Keith Packard <keithp at keithp.com>

Sorry for the delay. That works for me.

Reviewed-by: Matthieu Herrb <matthieu at herrb.eu>

> ---
>  hw/xfree86/common/xf86Xinput.h | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
> index 9fe8c87..66a64fb 100644
> --- a/hw/xfree86/common/xf86Xinput.h
> +++ b/hw/xfree86/common/xf86Xinput.h
> @@ -51,6 +51,7 @@
>  #ifndef _xf86Xinput_h
>  #define _xf86Xinput_h
>  
> +#include "xf86.h"
>  #include "xf86str.h"
>  #include "inputstr.h"
>  #include <X11/extensions/XI.h>
> @@ -85,7 +86,7 @@ typedef struct _InputDriverRec {
>  
>  /* This is to input devices what the ScrnInfoRec is to screens. */
>  
> -typedef struct _InputInfoRec {
> +struct _InputInfoRec {
>      struct _InputInfoRec *next;
>      char *name;
>      char *driver;
> @@ -110,7 +111,7 @@ typedef struct _InputInfoRec {
>      void *module;
>      XF86OptionPtr options;
>      InputAttributes *attrs;
> -} *InputInfoPtr;
> +};
>  
>  /* xf86Globals.c */
>  extern InputInfoPtr xf86InputDevs;
> -- 
> 2.0.1
>