xserver: Branch 'master' - 4 commits

[Keith Packard]

 configure.ac       |    2 +-
 include/list.h     |    2 +-
 xfixes/xfixesint.h |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c2ede8f92f0d6f15b1b2a04889cb54cd1728780b
Merge: 190b032 7050aae
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Mar 18 11:26:24 2013 -0700

    Merge remote-tracking branch 'whot/for-keith'

commit 7050aae69c2a55dfdbb5c6af7882307e90ba4275
Author: Robert Morell <rmorell at nvidia.com>
Date:   Tue Mar 12 09:40:16 2013 -0700

    list.h: Make xorg_list_init inline
    
    Otherwise this file is emitted in every unit that includes it.
    
    Signed-off-by: Robert Morell <rmorell at nvidia.com>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/include/list.h b/include/list.h
index 067c679..11de7c5 100644
--- a/include/list.h
+++ b/include/list.h
@@ -119,7 +119,7 @@ struct xorg_list {
  *
  * @param The list to initialized.
  */
-static void
+static inline void
 xorg_list_init(struct xorg_list *list)
 {
     list->next = list->prev = list;
commit 31595b528645a7e4903eb81da0fc332d78407f25
Author: Robert Morell <rmorell at nvidia.com>
Date:   Tue Mar 12 09:37:43 2013 -0700

    configure.ac: Require inputproto 2.3
    
    This picks up support for Xi pointer barriers in the protocol.
    
    Signed-off-by: Robert Morell <rmorell at nvidia.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 6e1ff65..44982b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -788,7 +788,7 @@ XPROTO="xproto >= 7.0.22"
 RANDRPROTO="randrproto >= 1.4.0"
 RENDERPROTO="renderproto >= 0.11"
 XEXTPROTO="xextproto >= 7.1.99"
-INPUTPROTO="inputproto >= 2.2.99.1"
+INPUTPROTO="inputproto >= 2.3"
 KBPROTO="kbproto >= 1.0.3"
 FONTSPROTO="fontsproto"
 FIXESPROTO="fixesproto >= 5.0"
commit 3ac2e61705432951f9e1b96b42b4214e7f748f94
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sat Mar 9 17:12:53 2013 +1000

    xfixes: ifdef PanoramiXFixes* (#62015)
    
    Fixes build failure with --disable-xinerama introduced by
    482e0cb cursor: Move pointer barrier code over to XI
    
    Reason is new include order: sdksyms.sh includes xfixes.h, which previously
    did not include xfixesint.h.
    
    As of 482e0cb xfixes.h includes xibarriers.h which includes xfixesint.h
    
    X.Org Bug 62015 <http://bugs.freedesktop.org/show_bug.cgi?id=62015>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Tested-by: Daniel Martin <consume.noise at gmail.com>

diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
index 334c71f..44e8890 100644
--- a/xfixes/xfixesint.h
+++ b/xfixes/xfixesint.h
@@ -291,8 +291,10 @@ int
  SProcXFixesDestroyPointerBarrier(ClientPtr client);
 
 /* Xinerama */
+#ifdef PANORAMIX
 extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
 void PanoramiXFixesInit(void);
 void PanoramiXFixesReset(void);
+#endif
 
 #endif                          /* _XFIXESINT_H_ */