summaryrefslogtreecommitdiffstats
path: root/src/mesa/glapi
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/glapi')
-rw-r--r--src/mesa/glapi/glapi.c6
-rw-r--r--src/mesa/glapi/glapitemp.h18
-rw-r--r--src/mesa/glapi/glthread.c24
-rw-r--r--src/mesa/glapi/glthread.h7
4 files changed, 25 insertions, 30 deletions
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index 82c48ea0658..64459e7a167 100644
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -1,4 +1,4 @@
-/* $Id: glapi.c,v 1.50 2001/03/07 05:06:11 brianp Exp $ */
+/* $Id: glapi.c,v 1.51 2001/03/12 00:48:38 gareth Exp $ */
/*
* Mesa 3-D graphics library
@@ -1912,7 +1912,3 @@ _glapi_check_table(const struct _glapi_table *table)
}
#endif
}
-
-
-
-
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 481949989ca..62038f54a9b 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -1,21 +1,21 @@
-/* $Id: glapitemp.h,v 1.24 2000/12/26 05:09:28 keithw Exp $ */
+/* $Id: glapitemp.h,v 1.25 2001/03/12 00:48:38 gareth Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.3
- *
- * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
- *
+ * Version: 3.5
+ *
+ * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions 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 NONINFRINGEMENT. IN NO EVENT SHALL
@@ -3011,7 +3011,7 @@ KEYWORD1 void KEYWORD2 NAME(TexCoord4fv)(const GLfloat *v)
{
DISPATCH(TexCoord4fv, (v), (F, ";"));
}
-
+
KEYWORD1 void KEYWORD2 NAME(TexCoord4iv)(const GLint *v)
{
DISPATCH(TexCoord4iv, (v), (F, ";"));
@@ -3426,7 +3426,7 @@ KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4svARB)(GLenum target, const GLshort *v
#ifdef DO_INIT
-static void NAME(InitDispatch)( void )
+static void NAME(InitDispatch)( void )
{
INITARGS;
INIT(GetCompressedTexImageARB);
diff --git a/src/mesa/glapi/glthread.c b/src/mesa/glapi/glthread.c
index 4599f39dcc9..16b3336b9f4 100644
--- a/src/mesa/glapi/glthread.c
+++ b/src/mesa/glapi/glthread.c
@@ -1,21 +1,21 @@
-/* $Id: glthread.c,v 1.7 2001/03/07 05:06:11 brianp Exp $ */
+/* $Id: glthread.c,v 1.8 2001/03/12 00:48:38 gareth Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.3
- *
- * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
- *
+ * Version: 3.5
+ *
+ * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions 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 NONINFRINGEMENT. IN NO EVENT SHALL
@@ -35,7 +35,7 @@
#include "all.h"
#else
#include "glheader.h"
-#include "glthread.h"
+#include "glthread.h"
#endif
@@ -117,9 +117,9 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
/*
- * Solaris/Unix International Threads -- Use only if POSIX threads
+ * Solaris/Unix International Threads -- Use only if POSIX threads
* aren't available on your Unix platform. Solaris 2.[34] are examples
- * of platforms where this is the case. Be sure to use -mt and/or
+ * of platforms where this is the case. Be sure to use -mt and/or
* -D_REENTRANT when compiling.
*/
#ifdef SOLARIS_THREADS
@@ -156,7 +156,7 @@ _glthread_GetTSD(_glthread_TSD *tsd)
#ifdef USE_LOCK_FOR_KEY
mutex_lock(&tsd->keylock);
thr_getspecific(tsd->key, &ret);
- mutex_unlock(&tsd->keylock);
+ mutex_unlock(&tsd->keylock);
#else
if ((errno = thr_getspecific(tsd->key, &ret)) != 0) {
perror(GET_TSD_ERROR);
@@ -188,7 +188,7 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
* Win32 Threads. The only available option for Windows 95/NT.
* Be sure that you compile using the Multithreaded runtime, otherwise
* bad things will happen.
- */
+ */
#ifdef WIN32_THREADS
unsigned long
diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h
index 864ea4a0d1c..639c46e427e 100644
--- a/src/mesa/glapi/glthread.h
+++ b/src/mesa/glapi/glthread.h
@@ -1,10 +1,10 @@
-/* $Id: glthread.h,v 1.7 2000/11/22 07:32:17 joukj Exp $ */
+/* $Id: glthread.h,v 1.8 2001/03/12 00:48:38 gareth Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.3
+ * Version: 3.5
*
- * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -249,4 +249,3 @@ _glthread_SetTSD(_glthread_TSD *, void *);
#endif /* THREADS_H */
-