xf86_ansic.h is no more.diff -r1.1 -r1.2 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h
(mrg)
--- xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h 2008/11/11 03:36:25 1.1
+++ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h 2009/06/18 02:47:23 1.2
@@ -17,27 +17,26 @@ | @@ -17,27 +17,26 @@ | |||
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | 18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | |
19 | * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | 19 | * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | |
20 | * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 20 | * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | |
21 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 21 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |
22 | */ | 22 | */ | |
23 | /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */ | 23 | /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */ | |
24 | 24 | |||
25 | #ifndef AG10E_H | 25 | #ifndef AG10E_H | |
26 | #define AG10E_H | 26 | #define AG10E_H | |
27 | 27 | |||
28 | #include "xf86.h" | 28 | #include "xf86.h" | |
29 | #include "xf86_OSproc.h" | 29 | #include "xf86_OSproc.h" | |
30 | #include "xf86_ansic.h" | |||
31 | #include "xf86RamDac.h" | 30 | #include "xf86RamDac.h" | |
32 | #include "Xmd.h" | 31 | #include "Xmd.h" | |
33 | #include "gcstruct.h" | 32 | #include "gcstruct.h" | |
34 | #include "ag10e_regs.h" | 33 | #include "ag10e_regs.h" | |
35 | #include "xf86sbusBus.h" | 34 | #include "xf86sbusBus.h" | |
36 | #include "xaa.h" | 35 | #include "xaa.h" | |
37 | 36 | |||
38 | typedef struct { | 37 | typedef struct { | |
39 | unsigned char *fb; | 38 | unsigned char *fb; | |
40 | unsigned char *regs; | 39 | unsigned char *regs; | |
41 | int vclipmax; | 40 | int vclipmax; | |
42 | int width; | 41 | int width; | |
43 | int height; | 42 | int height; |
--- xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c 2008/11/11 03:36:25 1.1
+++ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c 2009/06/18 02:47:23 1.2
@@ -27,27 +27,26 @@ | @@ -27,27 +27,26 @@ | |||
27 | #ifdef HAVE_CONFIG_H | 27 | #ifdef HAVE_CONFIG_H | |
28 | #include "config.h" | 28 | #include "config.h" | |
29 | #endif | 29 | #endif | |
30 | 30 | |||
31 | #include <fcntl.h> | 31 | #include <fcntl.h> | |
32 | #include <sys/time.h> | 32 | #include <sys/time.h> | |
33 | #include <sys/types.h> | 33 | #include <sys/types.h> | |
34 | #include <dev/sun/fbio.h> | 34 | #include <dev/sun/fbio.h> | |
35 | #include <dev/wscons/wsconsio.h> | 35 | #include <dev/wscons/wsconsio.h> | |
36 | 36 | |||
37 | #include <machine/int_fmtio.h> | 37 | #include <machine/int_fmtio.h> | |
38 | #include "xf86.h" | 38 | #include "xf86.h" | |
39 | #include "xf86_OSproc.h" | 39 | #include "xf86_OSproc.h" | |
40 | #include "xf86_ansic.h" | |||
41 | #include "xf86Version.h" | 40 | #include "xf86Version.h" | |
42 | #include "mipointer.h" | 41 | #include "mipointer.h" | |
43 | #include "mibstore.h" | 42 | #include "mibstore.h" | |
44 | #include "micmap.h" | 43 | #include "micmap.h" | |
45 | 44 | |||
46 | #include "fb.h" | 45 | #include "fb.h" | |
47 | #include "xf86cmap.h" | 46 | #include "xf86cmap.h" | |
48 | #include "ag10e.h" | 47 | #include "ag10e.h" | |
49 | #include "xf86sbusBus.h" | 48 | #include "xf86sbusBus.h" | |
50 | 49 | |||
51 | static const OptionInfoRec * AG10EAvailableOptions(int chipid, int busid); | 50 | static const OptionInfoRec * AG10EAvailableOptions(int chipid, int busid); | |
52 | static void AG10EIdentify(int flags); | 51 | static void AG10EIdentify(int flags); | |
53 | static Bool AG10EProbe(DriverPtr drv, int flags); | 52 | static Bool AG10EProbe(DriverPtr drv, int flags); |