frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
Keith Packard 2013-03-18 11:26:24 -07:00
parent 190b032151 7050aae69c
commit c2ede8f92f
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -795,7 +795,7 @@ XPROTO="xproto >= 7.0.22"
RANDRPROTO="randrproto >= 1.4.0" RANDRPROTO="randrproto >= 1.4.0"
RENDERPROTO="renderproto >= 0.11" RENDERPROTO="renderproto >= 0.11"
XEXTPROTO="xextproto >= 7.1.99" XEXTPROTO="xextproto >= 7.1.99"
INPUTPROTO="inputproto >= 2.2.99.1" INPUTPROTO="inputproto >= 2.3"
KBPROTO="kbproto >= 1.0.3" KBPROTO="kbproto >= 1.0.3"
FONTSPROTO="fontsproto" FONTSPROTO="fontsproto"
FIXESPROTO="fixesproto >= 5.0" FIXESPROTO="fixesproto >= 5.0"

2
include/list.h
View File

@ -119,7 +119,7 @@ struct xorg_list {
* *
* @param The list to initialized. * @param The list to initialized.
*/ */
static void static inline void
xorg_list_init(struct xorg_list *list) xorg_list_init(struct xorg_list *list)
{ {
list->next = list->prev = list; list->next = list->prev = list;

2
xfixes/xfixesint.h
View File

@ -291,8 +291,10 @@ int
SProcXFixesDestroyPointerBarrier(ClientPtr client); SProcXFixesDestroyPointerBarrier(ClientPtr client);
/* Xinerama */ /* Xinerama */
#ifdef PANORAMIX
extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr); extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
void PanoramiXFixesInit(void); void PanoramiXFixesInit(void);
void PanoramiXFixesReset(void); void PanoramiXFixesReset(void);
#endif
#endif /* _XFIXESINT_H_ */ #endif /* _XFIXESINT_H_ */