summaryrefslogtreecommitdiff
path: root/src/mesa/glapi/glthread.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/glapi/glthread.h')
-rw-r--r--src/mesa/glapi/glthread.h26
1 files changed, 10 insertions, 16 deletions
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