diff options
Diffstat (limited to 'src/mesa/glapi')
-rw-r--r-- | src/mesa/glapi/glapi.c | 8 | ||||
-rw-r--r-- | src/mesa/glapi/glthread.h | 26 |
2 files changed, 14 insertions, 20 deletions
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index fd12f24ee6..c36b641869 100644 --- a/src/mesa/glapi/glapi.c +++ b/src/mesa/glapi/glapi.c @@ -1,4 +1,4 @@ -/* $Id: glapi.c,v 1.47 2000/10/27 18:31:22 brianp Exp $ */ +/* $Id: glapi.c,v 1.48 2000/11/22 07:32:17 joukj Exp $ */ /* * Mesa 3-D graphics library @@ -50,7 +50,7 @@ #include "glthread.h" #if defined(MESA_TRACE) -#include "types.h" +#include "mtypes.h" #endif /* This is used when thread safety is disabled */ @@ -835,7 +835,7 @@ static struct name_address_offset static_functions[] = { { "glCopyTexSubImage1DEXT", NAME(glCopyTexSubImage1DEXT), _gloffset_CopyTexSubImage1D }, { "glCopyTexSubImage2DEXT", NAME(glCopyTexSubImage2DEXT), _gloffset_CopyTexSubImage2D }, #undef NAME - + /* 11. GL_EXT_histogram */ #ifdef GL_EXT_histogram #define NAME(X) (GLvoid *) X @@ -874,7 +874,7 @@ static struct name_address_offset static_functions[] = { { "glGetSeparableFilterEXT", NAME(glGetSeparableFilterEXT), _gloffset_GetSeparableFilterEXT }, { "glSeparableFilter2DEXT", NAME(glSeparableFilter2DEXT), _gloffset_SeparableFilter2D }, #undef NAME - + /* 14. GL_SGI_color_table */ #ifdef GL_SGI_color_table #define NAME(X) (GLvoid *) X diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h index 726811f696..864ea4a0d1 100644 --- a/src/mesa/glapi/glthread.h +++ b/src/mesa/glapi/glthread.h @@ -1,21 +1,21 @@ -/* $Id: glthread.h,v 1.6 2000/11/17 11:00:56 joukj Exp $ */ +/* $Id: glthread.h,v 1.7 2000/11/22 07:32:17 joukj Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 - * + * * Copyright (C) 1999-2000 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 @@ -57,17 +57,11 @@ */ /* - * If this file is accidentally included by a non-threaded build, + * If this file is accidentally included by a non-threaded build, * it should not cause the build to fail, or otherwise cause problems. * In general, it should only be included when needed however. */ -#ifdef VMS -# if defined(PTHREADS) -#include "types.h" -#endif -#endif - #ifndef GLTHREAD_H #define GLTHREAD_H @@ -119,9 +113,9 @@ typedef pthread_mutex_t _glthread_Mutex; /* - * Solaris threads. Use only up to Solaris 2.4. + * Solaris threads. Use only up to Solaris 2.4. * Solaris 2.5 and higher provide POSIX threads. - * Be sure to compile with -mt on the Solaris compilers, or + * Be sure to compile with -mt on the Solaris compilers, or * use -D_REENTRANT if using gcc. */ #ifdef SOLARIS_THREADS @@ -149,7 +143,7 @@ typedef mutex_t _glthread_Mutex; /* - * Windows threads. Should work with Windows NT and 95. + * Windows threads. Should work with Windows NT and 95. * IMPORTANT: Link with multithreaded runtime library when THREADS are * used! */ @@ -234,7 +228,7 @@ typedef GLuint _glthread_Mutex; /* - * Platform independent thread specific data API. + * Platform independent thread specific data API. */ extern unsigned long |