diff options
| author | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2011-03-13 18:39:36 +0200 |
|---|---|---|
| committer | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2011-03-13 18:39:36 +0200 |
| commit | 796b35bcd1452a5fdfcc20b8d55939dbe09deccd (patch) | |
| tree | db5c223fc7625463ad438ffd22010493c6f36c70 | |
| parent | 8882b131524ba7c75722f484209371445d9f9008 (diff) | |
Added more missing #ifdef to xf86Resources.h
| -rw-r--r-- | src/nsc_gx1_shadow.c | 2 | ||||
| -rw-r--r-- | src/nsc_gx1_video.c | 2 | ||||
| -rw-r--r-- | src/nsc_gx2_shadow.c | 2 | ||||
| -rw-r--r-- | src/nsc_gx2_video.c | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/nsc_gx1_shadow.c b/src/nsc_gx1_shadow.c index 000befa..abb40dd 100644 --- a/src/nsc_gx1_shadow.c +++ b/src/nsc_gx1_shadow.c @@ -147,7 +147,9 @@ #include "xf86.h" #include "xf86_OSproc.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#endif #include "xf86PciInfo.h" #include "xf86Pci.h" #include "nsc.h" diff --git a/src/nsc_gx1_video.c b/src/nsc_gx1_video.c index 108d9c0..9e58480 100644 --- a/src/nsc_gx1_video.c +++ b/src/nsc_gx1_video.c @@ -150,7 +150,9 @@ #include "xf86.h" #include "xf86_OSproc.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#endif #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/nsc_gx2_shadow.c b/src/nsc_gx2_shadow.c index a1e9871..f190e1e 100644 --- a/src/nsc_gx2_shadow.c +++ b/src/nsc_gx2_shadow.c @@ -147,7 +147,9 @@ #include "xf86.h" #include "xf86_OSproc.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#endif #include "xf86PciInfo.h" #include "xf86Pci.h" #include "nsc.h" diff --git a/src/nsc_gx2_video.c b/src/nsc_gx2_video.c index 45590b0..bba73e0 100644 --- a/src/nsc_gx2_video.c +++ b/src/nsc_gx2_video.c @@ -150,7 +150,9 @@ #include "xf86.h" #include "xf86_OSproc.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#endif #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" |