summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nv_include.h5
-rw-r--r--src/nv_local.h3
-rw-r--r--src/nv_video.c3
-rw-r--r--src/riva_include.h5
-rw-r--r--src/riva_local.h3
5 files changed, 19 insertions, 0 deletions
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"