On 09/16/2011 01:52 PM, Peter Hutterer wrote: > On Wed, Sep 14, 2011 at 10:33:56PM -0700, Chase Douglas wrote: >> Signed-off-by: Chase Douglas <[email protected]> >> --- >> configure.ac | 3 +++ >> 1 files changed, 3 insertions(+), 0 deletions(-) >> >> diff --git a/configure.ac b/configure.ac >> index 6c2f731..f3d6d8e 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -39,6 +39,9 @@ if ! test "x$UNSTABLE_LIB" = xyes; then >> AC_MSG_ERROR([This branch contains elements which have not yet been >> finalised. When this branch is updated, you will probably need to recompile >> both the any clients using the library, and may experience crashes or >> undefined behaviour if you do not.]) >> fi >> >> +# Define macros for compiling with unstable protocols >> +AC_SUBST(CFLAGS, "-DXINPUT2_1_USE_UNSTABLE_PROTOCOL >> -DXINPUT2_2_USE_UNSTABLE_PROTOCOL") >> + > > I think the 2.1 protocol is stable enough so we don't need the first define. > it's not in master anyway.
Ok, then the solution is to rip out the XINPUT2_1_USE_UNSTABLE_PROTOCOL check in the multitouch-devel inputproto branch, and then fix up this commit to only define the 2.2 macro. I'll do both and push. Let me know if that isn't what you intended. -- Chase _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
