diff options
author | marha <marha@users.sourceforge.net> | 2010-04-12 09:53:17 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-04-12 09:53:17 +0000 |
commit | 29b86f9852b2b7ecc31cdfee56679537e40bc6e2 (patch) | |
tree | 1e6ec8ccf2dbf773260a1953b8e13c49f9b7c5f5 /mesalib/src/glu/sgi/libutil | |
parent | 529236591df7366479a6fac30b387667678fd1ba (diff) | |
download | vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.tar.gz vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.tar.bz2 vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.zip |
svn merge -r524:HEAD "^/branches/released" .
Diffstat (limited to 'mesalib/src/glu/sgi/libutil')
-rw-r--r-- | mesalib/src/glu/sgi/libutil/error.c | 2 | ||||
-rw-r--r-- | mesalib/src/glu/sgi/libutil/mipmap.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/mesalib/src/glu/sgi/libutil/error.c b/mesalib/src/glu/sgi/libutil/error.c index e734818ed..721274845 100644 --- a/mesalib/src/glu/sgi/libutil/error.c +++ b/mesalib/src/glu/sgi/libutil/error.c @@ -31,8 +31,6 @@ #include "gluos.h" #include "gluint.h" #include <GL/glu.h> -#include <stdio.h> -#include <stdlib.h> struct token_string diff --git a/mesalib/src/glu/sgi/libutil/mipmap.c b/mesalib/src/glu/sgi/libutil/mipmap.c index d1fd5a7d7..8e63eaaad 100644 --- a/mesalib/src/glu/sgi/libutil/mipmap.c +++ b/mesalib/src/glu/sgi/libutil/mipmap.c @@ -36,7 +36,6 @@ #include <string.h> #include <limits.h> /* UINT_MAX */ #include <math.h> -#include "gluint.h" typedef union { unsigned char ub[4]; |