andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
This commit is contained in:
Keith Packard 2014-07-28 12:09:51 -07:00
parent 3714f54016
commit ee9f766abf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xfree86/common/xf86Xinput.h
View File

@ -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;