projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: update copyright
[gnulib.git]
/
lib
/
glthread
/
lock.h
diff --git
a/lib/glthread/lock.h
b/lib/glthread/lock.h
index
7fa1a93
..
6fe3750
100644
(file)
--- a/
lib/glthread/lock.h
+++ b/
lib/glthread/lock.h
@@
-1,5
+1,5
@@
/* Locking in multithreaded situations.
/* Locking in multithreaded situations.
- Copyright (C) 2005-201
2
Free Software Foundation, Inc.
+ Copyright (C) 2005-201
4
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-12,8
+12,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* Written by Bruno Haible <bruno@clisp.org>, 2005.
Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
/* Written by Bruno Haible <bruno@clisp.org>, 2005.
Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
@@
-614,7
+613,7
@@
extern int glthread_once_singlethreaded (gl_once_t *once_control);
/* ========================================================================= */
/* ========================================================================= */
-#if USE_WIN
32
_THREADS
+#if USE_WIN
DOWS
_THREADS
# define WIN32_LEAN_AND_MEAN /* avoid including junk */
# include <windows.h>
# define WIN32_LEAN_AND_MEAN /* avoid including junk */
# include <windows.h>
@@
-623,8
+622,8
@@
extern int glthread_once_singlethreaded (gl_once_t *once_control);
extern "C" {
# endif
extern "C" {
# endif
-/* We can use CRITICAL_SECTION directly, rather than the
Win32 Event, Mutex
,
- Semaphore types, because
+/* We can use CRITICAL_SECTION directly, rather than the
native Windows Event
,
+
Mutex,
Semaphore types, because
- we need only to synchronize inside a single process (address space),
not inter-process locking,
- we don't need to support trylock operations. (TryEnterCriticalSection
- we need only to synchronize inside a single process (address space),
not inter-process locking,
- we don't need to support trylock operations. (TryEnterCriticalSection
@@
-710,9
+709,9
@@
extern int glthread_rwlock_destroy_func (gl_rwlock_t *lock);
/* --------------------- gl_recursive_lock_t datatype --------------------- */
/* --------------------- gl_recursive_lock_t datatype --------------------- */
-/* The
Win32 documentation says that CRITICAL_SECTION already implements a
- recursive lock. But we need not rely on it: It's easy to implement a
- recursive lock without this assumption. */
+/* The
native Windows documentation says that CRITICAL_SECTION already
+ implements a recursive lock. But we need not rely on it: It's easy to
+
implement a
recursive lock without this assumption. */
typedef struct
{
typedef struct
{
@@
-764,7
+763,7
@@
extern void glthread_once_func (gl_once_t *once_control, void (*initfunction) (v
/* ========================================================================= */
/* ========================================================================= */
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN
32
_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN
DOWS
_THREADS)
/* Provide dummy implementation if threads are not supported. */
/* Provide dummy implementation if threads are not supported. */