On Wed, Jan 23, 2013 at 12:05:40PM -0800, Jason Gerecke wrote: > Combined with the "#ifndef" in commit c95c1f2c, this fixes the compiler > warnings generated about ARRAY_SIZE being redefined. > > Signed-off-by: Jason Gerecke <killert...@gmail.com> > ---
urgh, sorry. I think I merged the wrong patch. Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> Cheers, Peter > src/xf86Wacom.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h > index 2475550..cf71c79 100644 > --- a/src/xf86Wacom.h > +++ b/src/xf86Wacom.h > @@ -23,7 +23,6 @@ > #include <xorg-server.h> > #include <xorgVersion.h> > > -#include <wacom-util.h> > #include "Xwacom.h" > > /* max number of input events to read in one read call */ > @@ -38,6 +37,8 @@ > #include <mipointer.h> > #include <X11/Xatom.h> > > +#include <wacom-util.h> > + > #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 18 > #define LogMessageVerbSigSafe xf86MsgVerb > #endif > -- > 1.8.1.1 > > > ------------------------------------------------------------------------------ > Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, > MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current > with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft > MVPs and experts. ON SALE this month only -- learn more at: > http://p.sf.net/sfu/learnnow-d2d > _______________________________________________ > Linuxwacom-devel mailing list > Linuxwacom-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel > ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnnow-d2d _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
