diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2015-03-18 11:05:40 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2015-03-18 11:05:40 +0900 |
| commit | af1862a37570fa512a525ab47d72b30400d2e2d6 (patch) | |
| tree | 29a609a6abb0bd697e0f7a701cc90bdf213eb31a | |
| parent | fcd37f65f485291084c174666bd605e215bf1398 (diff) | |
Always include misync.h before other misync headers
Older versions of xserver didn't include misync.h from other misync
headers as needed.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/radeon_sync.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index acd9fe0d..0468aeb7 100644 --- a/configure.ac +++ b/configure.ac @@ -131,11 +131,11 @@ AC_CHECK_DECL(xorg_list_init, #include "xorg-server.h" #include "list.h"]) -AC_CHECK_HEADERS([misyncshm.h], [], [], +AC_CHECK_HEADERS([misync.h], [], [], [#include <X11/Xdefs.h> #include <X11/Xfuncproto.h> - #include "screenint.h" - #include "xorg-server.h"]) + #include <xorg-server.h> + #include <pixmap.h>]) AC_CHECK_HEADERS([present.h], [], [], [#include <X11/Xmd.h> diff --git a/src/radeon_sync.c b/src/radeon_sync.c index d8ab5bce..659c165a 100644 --- a/src/radeon_sync.c +++ b/src/radeon_sync.c @@ -23,8 +23,9 @@ #include "radeon.h" -#ifdef HAVE_MISYNCSHM_H +#ifdef HAVE_MISYNC_H +#include "misync.h" #include "misyncshm.h" #include "misyncstr.h" @@ -124,13 +125,13 @@ radeon_sync_close(ScreenPtr screen) info->CreateFence = NULL; } -#else /* !HAVE_MISYNCSHM_H */ +#else /* !HAVE_MISYNC_H */ Bool radeon_sync_init(ScreenPtr screen) { xf86DrvMsg(xf86ScreenToScrn(screen)->scrnIndex, X_INFO, - "SYNC extension fences disabled because misyncshm.h not " + "SYNC extension fences disabled because misync.h not " "available at build time\n"); return FALSE; |