summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/README.DJ4
-rw-r--r--src/glut/dos/callback.c2
-rw-r--r--src/mesa/x86/assyntax.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/README.DJ b/docs/README.DJ
index 2e663d2ee7..63d3711e0e 100644
--- a/docs/README.DJ
+++ b/docs/README.DJ
@@ -128,8 +128,8 @@ FAQ:
Q) What is NUL driver good for, if I don't get any output at all?
A) For debugging. The NUL driver is very much like OSMesa. Everything is
- done just the same as VESA/VGA drivers, only it doesn't touches your
- video hardware. You can query the actual buffer by issuing:
+ done just the same as VESA/VGA drivers, only it doesn't touch your video
+ hardware. You can query the actual buffer by issuing:
DMesaGetIntegerv(DMESA_GET_BUFFER_ADDR, &buffer);
and dump it to a file.
diff --git a/src/glut/dos/callback.c b/src/glut/dos/callback.c
index 773dfb2758..b322f67351 100644
--- a/src/glut/dos/callback.c
+++ b/src/glut/dos/callback.c
@@ -129,7 +129,7 @@ void APIENTRY glutIdleFunc (GLUTidleCB func)
void APIENTRY glutTimerFunc (unsigned int millis, GLUTtimerCB func, int value)
{
static GLUTSShotCB g_sscb[MAX_SSHOT_CB];
- static int virgin = GL_TRUE;
+ static GLboolean virgin = GL_TRUE;
int i;
int ttl;
diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h
index f37bde3a7d..95a74ae3db 100644
--- a/src/mesa/x86/assyntax.h
+++ b/src/mesa/x86/assyntax.h
@@ -1216,7 +1216,7 @@ SECTION _DATA public align=16 class=DATA use32 flat
#define LES(a, b) les b, a
#define LFS(a, b) lfs b, a
#define LGS(a, b) lgs b, a
-#define LSS(a, b) lss b, a
+#define LSS(a, b) lss b, P_(a)
#define LLDT(a) lldt a
#define LMSW(a) lmsw a
#define LOCK lock