diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2003-12-04 18:17:32 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2003-12-04 18:17:32 +0000 |
commit | e78dd78e4af644fbad6cd8f3135ec7364bd54a5f (patch) | |
tree | c66c1344f2d5f77d452c2bb86ca3a1006eca1aad /src/mesa/drivers/dri/sis/sis_debug.c | |
parent | ecb1a5f7f98b9e42965318db99b6996f12b87e59 (diff) |
merge latest DRI sis driver changes from the DRI trunk
Diffstat (limited to 'src/mesa/drivers/dri/sis/sis_debug.c')
-rw-r--r-- | src/mesa/drivers/dri/sis/sis_debug.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_debug.c b/src/mesa/drivers/dri/sis/sis_debug.c index e950bcee01..99cb09c255 100644 --- a/src/mesa/drivers/dri/sis/sis_debug.c +++ b/src/mesa/drivers/dri/sis/sis_debug.c @@ -18,7 +18,7 @@ of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR +IN NO EVENT SHALL SILICON INTEGRATED SYSTEMS CORP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -76,7 +76,6 @@ dump_agp (void *addr, int dword_count) } } -#ifndef _SOLO void d2f_once (GLcontext * ctx) { @@ -155,4 +154,3 @@ dvidmem (unsigned char *addr, int size) close (fh); } } -#endif |