diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-07-29 20:02:38 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-07-29 20:02:38 +0000 |
| commit | 6e5332d8a437b02c3bf4f4d8304340a787a32126 (patch) | |
| tree | 75ef0a973b7314761afe4071b09991df60160efa /driver/xf86-video-mga/util | |
| parent | bbd8ae0998e921cf909d2960f012f134ba6c598c (diff) | |
update xf86-video-mga to 1.4.9
Diffstat (limited to 'driver/xf86-video-mga/util')
| -rw-r--r-- | driver/xf86-video-mga/util/Makefile.in | 9 | ||||
| -rw-r--r-- | driver/xf86-video-mga/util/stormdwg.c | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/driver/xf86-video-mga/util/Makefile.in b/driver/xf86-video-mga/util/Makefile.in index 957449d6b..2ac4f86d8 100644 --- a/driver/xf86-video-mga/util/Makefile.in +++ b/driver/xf86-video-mga/util/Makefile.in @@ -100,6 +100,7 @@ DRI_CFLAGS = @DRI_CFLAGS@ DRI_FALSE = @DRI_FALSE@ DRI_LIBS = @DRI_LIBS@ DRI_TRUE = @DRI_TRUE@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -128,6 +129,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -136,8 +138,11 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +PCIACCESS_LIBS = @PCIACCESS_LIBS@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -148,10 +153,14 @@ USE_XAA_TRUE = @USE_XAA_TRUE@ VERSION = @VERSION@ XORG_CFLAGS = @XORG_CFLAGS@ XORG_LIBS = @XORG_LIBS@ +XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@ +XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_NMEDIT = @ac_ct_NMEDIT@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ diff --git a/driver/xf86-video-mga/util/stormdwg.c b/driver/xf86-video-mga/util/stormdwg.c index 8f04e0eb8..99f76cce9 100644 --- a/driver/xf86-video-mga/util/stormdwg.c +++ b/driver/xf86-video-mga/util/stormdwg.c @@ -7,7 +7,7 @@ #include <stdio.h> #include <stdlib.h> -char *opcodes[] = { +const char *opcodes[] = { "line_open", /* 0000 */ "autoline_open", /* 0001 */ "line_close", /* 0010 */ @@ -29,7 +29,7 @@ char *opcodes[] = { "iload filter" /* 1111 */ }; -char *atype[] = { +const char *atype[] = { "rpl - Write (Replace)", /* 000 */ "rstr - read-modify-write (raster)", /* 001 */ "reserved", /* 010 */ @@ -40,7 +40,7 @@ char *atype[] = { "I - Gouraud (with depth compare)" /* 111 */ }; -char *zmode[] = { +const char *zmode[] = { "NOZCMP - always", /* 000 */ "reserved", /* 001 */ "ZE - depth =", /* 010 */ @@ -51,7 +51,7 @@ char *zmode[] = { "zgte" /* 111 */ }; -char *bop[] = { +const char *bop[] = { "0", /* 0000 */ "~(D|S)", /* 0001 */ "D & ~S", /* 0010 */ @@ -73,7 +73,7 @@ char *bop[] = { "1" /* 1111 */ }; -char *bitmod[] = { +const char *bitmod[] = { "BMONOLEF - Source is mono, or if iload, source is little endian", /* 0000 */ "BPLAN - source is mono from one plane", /* 0001 */ "BFCOL - source is colour, and is formatted from host", /* 0010 */ |