diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/nv_include.h | 5 | ||||
| -rw-r--r-- | src/nv_local.h | 3 | ||||
| -rw-r--r-- | src/nv_video.c | 3 | ||||
| -rw-r--r-- | src/riva_include.h | 5 | ||||
| -rw-r--r-- | src/riva_local.h | 3 |
7 files changed, 32 insertions, 2 deletions
@@ -1,6 +1,16 @@ 2006-04-27 Aaron Plattner <aplattner@nvidia.com> * configure.ac: + * src/nv_include.h: + * src/nv_local.h: + * src/nv_video.c: + * src/riva_include.h: + * src/riva_local.h: + Add the libcwrapper back, conditionalized on the server version. + +2006-04-27 Aaron Plattner <aplattner@nvidia.com> + + * configure.ac: * src/nv_video.c: Determine whether PutImage hooks take a DrawablePtr by server version. Remove dependency on xorg-server >= 1.0.99.901. diff --git a/configure.ac b/configure.ac index 8f44298..31637e8 100644 --- a/configure.ac +++ b/configure.ac @@ -53,10 +53,11 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) -# Determine whether XV PutImage takes a DrawablePtr +# Determine whether XV PutImage takes a DrawablePtr and whether or not to use +# the libcwrapper. PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901], [AC_DEFINE(HAVE_XV_DRAWABLE,1,[XV hooks take a DrawablePtr])], - []) + [AC_DEFINE(USE_LIBC_WRAPPER,1,[Use the libc wrapper])]) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) diff --git a/src/nv_include.h b/src/nv_include.h index eb32143..071a4a0 100644 --- a/src/nv_include.h +++ b/src/nv_include.h @@ -3,13 +3,18 @@ #ifndef __NV_INCLUDE_H__ #define __NV_INCLUDE_H__ +#if !USE_LIBC_WRAPPER #include <string.h> #include <math.h> +#endif /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" +#if USE_LIBC_WRAPPER +#include "xf86_ansic.h" +#endif #include "compiler.h" /* Drivers for PCI hardware need this */ diff --git a/src/nv_local.h b/src/nv_local.h index 3d5d202..6cb0264 100644 --- a/src/nv_local.h +++ b/src/nv_local.h @@ -46,6 +46,9 @@ * HW. Put all affected includes, typdefs, etc. here so the riva_hw.* files * can stay generic in nature. */ +#if USE_LIBC_WRAPPER +#include "xf86_ansic.h" +#endif #include "compiler.h" #include "xf86_OSproc.h" diff --git a/src/nv_video.c b/src/nv_video.c index 33f3bb5..1a428fb 100644 --- a/src/nv_video.c +++ b/src/nv_video.c @@ -7,6 +7,9 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" +#if USE_LIBC_WRAPPER +#include "xf86_ansic.h" +#endif #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/riva_include.h b/src/riva_include.h index 2f269df..675899b 100644 --- a/src/riva_include.h +++ b/src/riva_include.h @@ -3,12 +3,17 @@ #ifndef __RIVA_INCLUDE_H__ #define __RIVA_INCLUDE_H__ +#if !USE_LIBC_WRAPPER #include <string.h> +#endif /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" +#if USE_LIBC_WRAPPER +#include "xf86_ansic.h" +#endif #include "compiler.h" /* Drivers for PCI hardware need this */ diff --git a/src/riva_local.h b/src/riva_local.h index 833ed04..bdfe2b9 100644 --- a/src/riva_local.h +++ b/src/riva_local.h @@ -46,6 +46,9 @@ * HW. Put all affected includes, typdefs, etc. here so the riva_hw.* files * can stay generic in nature. */ +#if USE_LIBC_WRAPPER +#include "xf86_ansic.h" +#endif #include "compiler.h" #include "xf86_OSproc.h" |