diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-06-01 07:57:27 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-06-01 08:00:20 +0100 |
| commit | b617f80ca5d386c1c248bab64276a9f283173a21 (patch) | |
| tree | 41bd08651ba667deb1154fd9161922c1e58d53bd | |
| parent | 7337f558d8bae26e626305fc478d070368bd86cd (diff) | |
compat: Another day, another ABI change for OsBlockSGIO
Now OsBlockSGIO/OsReleaseSGIO are back in the headers, but we include
compat-api.h too early so we do not remove them. Instead, move the
avoidance inline.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/compat-api.h | 6 | ||||
| -rw-r--r-- | src/sna/sna_display.c | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/compat-api.h b/src/compat-api.h index 371ece9e..64e3736c 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -30,7 +30,6 @@ #include <xorg-server.h> #include <xorgVersion.h> -#include <xf86Module.h> #include <picturestr.h> #ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR @@ -251,9 +250,4 @@ static inline void FreePixmap(PixmapPtr pixmap) #define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d) #endif -#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22, 0) -#define OsBlockSIGIO() -#define OsReleaseSIGIO() -#endif - #endif diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 3a627a46..0cf2bdbf 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -978,7 +978,16 @@ done: sna_output->backlight.iface, best_iface, output->name); } -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,12,99,901,0) +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22, 0) +static inline int sigio_block(void) +{ + return 0; +} +static inline void sigio_unblock(int was_blocked) +{ + (void)was_blocked; +} +#elif XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,12,99,901,0) static inline int sigio_block(void) { OsBlockSIGIO(); |