diff options
| author | Jon Nettleton <jon.nettleton@gmail.com> | 2007-05-23 21:48:35 +0000 |
|---|---|---|
| committer | Jon Nettleton <jon.nettleton@gmail.com> | 2007-05-23 21:48:35 +0000 |
| commit | 4034ed22f533ae774685e189b5caac13d2c22037 (patch) | |
| tree | 779a8be2c61a69e6d2a3642770841f7d7d71f21a | |
| parent | da57052f83fd2fc9cce9ca01d2582aea0c988e06 (diff) | |
remove different includes based on xorg version check
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | unichrome/via.h | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index ce6a57f0c144..727db5d2059f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-05-18 Jon Nettleton <jon-dot-nettleton-at-gmail-dot-com> + + * unichrome/via.h: + + Remove version check for older version of Xorg. This is + really not necessary anymore, and was causing some breakage + with xorg-server's new version numbering. + 2007-05-18 Xavier Bachelot <xavier-at-bachelot-dot-org> * libxvmc/Makefile.am: diff --git a/unichrome/via.h b/unichrome/via.h index a983c292ea12..e741d774b924 100644 --- a/unichrome/via.h +++ b/unichrome/via.h @@ -27,17 +27,10 @@ #include "xorgVersion.h" -/* use xf86_ansic for < xorg 7.1 */ -#if ( XORG_VERSION_MAJOR > 6 && XORG_VERSION_MINOR > 0 ) #include <errno.h> #include <string.h> #include <stdio.h> #include <math.h> -#include <assert.h> -#include <stdlib.h> -#else -#include "xf86_ansic.h" -#endif /* Video status flag */ |