diff options
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/compat-api.h | 41 | ||||
| -rw-r--r-- | src/intel.h | 1 | ||||
| -rw-r--r-- | src/legacy/i810/i810.h | 1 | ||||
| -rw-r--r-- | src/sna/sna.h | 1 | ||||
| -rw-r--r-- | uxa/uxa-priv.h | 2 |
6 files changed, 47 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 448a354e..fd139ee2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,6 +43,7 @@ NULL:=# intel_drv_la_SOURCES = \ intel_list.h \ intel_module.c \ + compat-api.h \ $(NULL) if UXA diff --git a/src/compat-api.h b/src/compat-api.h new file mode 100644 index 00000000..1bb77241 --- /dev/null +++ b/src/compat-api.h @@ -0,0 +1,41 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Dave Airlie <airlied@redhat.com> + */ + +/* this file provides API compat between server post 1.13 and pre it, + it should be reused inside as many drivers as possible */ +#ifndef COMPAT_API_H +#define COMPAT_API_H + +#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR +#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] +#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p +#endif + +#ifndef XF86_HAS_SCRN_CONV +#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] +#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] +#endif + +#endif diff --git a/src/intel.h b/src/intel.h index f806aea8..e274db10 100644 --- a/src/intel.h +++ b/src/intel.h @@ -69,6 +69,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "intel_driver.h" #include "intel_list.h" +#include "compat-api.h" #if HAVE_UDEV #include <libudev.h> diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h index 2c0b53e3..f4caf562 100644 --- a/src/legacy/i810/i810.h +++ b/src/legacy/i810/i810.h @@ -51,6 +51,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "xorg-server.h" #include <pciaccess.h> +#include "compat-api.h" #ifdef HAVE_DRI1 #include "xf86drm.h" #include "sarea.h" diff --git a/src/sna/sna.h b/src/sna/sna.h index 790f5ffe..6c6650b1 100644 --- a/src/sna/sna.h +++ b/src/sna/sna.h @@ -59,6 +59,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <xf86drm.h> #include <xf86drmMode.h> +#include "../compat-api.h" #define _XF86DRI_SERVER_ #include <dri2.h> #include <i915_drm.h> diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h index b24ec4ff..b74a625a 100644 --- a/uxa/uxa-priv.h +++ b/uxa/uxa-priv.h @@ -59,6 +59,8 @@ #endif #include "damage.h" +#include "../src/compat-api.h" + /* Provide substitutes for gcc's __FUNCTION__ on other compilers */ #if !defined(__GNUC__) && !defined(__FUNCTION__) # if defined(__STDC__) && (__STDC_VERSION__>=199901L) /* C99 */ |