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

This commit is contained in:
Keith Packard 2013-03-18 11:26:24 -07:00
commit c2ede8f92f
3 changed files with 4 additions and 2 deletions

View File

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

View File

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

View File

@ -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_ */