diff options
| author | Keith Packard <keithp@keithp.com> | 2013-03-18 11:26:24 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-03-18 11:26:24 -0700 |
| commit | c2ede8f92f0d6f15b1b2a04889cb54cd1728780b (patch) | |
| tree | 0e2fff7bead31be5e4ab0118fc5ac86ab2a4ec67 | |
| parent | 190b0321510b99d4738915f540cea5c0c51e07e2 (diff) | |
| parent | 7050aae69c2a55dfdbb5c6af7882307e90ba4275 (diff) | |
Merge remote-tracking branch 'whot/for-keith'
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/list.h | 2 | ||||
| -rw-r--r-- | xfixes/xfixesint.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 43b1638f6..e0750bbcc 100644 --- a/configure.ac +++ b/configure.ac @@ -795,7 +795,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" diff --git a/include/list.h b/include/list.h index 067c6794f..11de7c561 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; diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h index 334c71fbf..44e889040 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_ */ |