diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-01-08 11:29:59 +0100 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-01-08 11:30:45 +0100 |
commit | 52400b5ae463c90f83538ad43a76d61ced97f71d (patch) | |
tree | 90ab43baeaa0d3129dc1899cb6bcf5759c8a7386 /gl/tests/glthread/lock.h | |
parent | 3dc1f4ad374c3e986fb3ab3c78442e9adfcce018 (diff) | |
download | gnutls-52400b5ae463c90f83538ad43a76d61ced97f71d.tar.gz |
Updated gnulib and added usleep and getaddrinfo modules.
Diffstat (limited to 'gl/tests/glthread/lock.h')
-rw-r--r-- | gl/tests/glthread/lock.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gl/tests/glthread/lock.h b/gl/tests/glthread/lock.h index 028d881d4c..02377cdeec 100644 --- a/gl/tests/glthread/lock.h +++ b/gl/tests/glthread/lock.h @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2011 Free Software Foundation, Inc. + Copyright (C) 2005-2012 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 @@ -614,7 +614,7 @@ extern int glthread_once_singlethreaded (gl_once_t *once_control); /* ========================================================================= */ -#if USE_WIN32_THREADS +#if USE_WINDOWS_THREADS # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include <windows.h> @@ -623,8 +623,8 @@ extern int glthread_once_singlethreaded (gl_once_t *once_control); 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 @@ -710,9 +710,9 @@ extern int glthread_rwlock_destroy_func (gl_rwlock_t *lock); /* --------------------- 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 { @@ -764,7 +764,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_WIN32_THREADS) +#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS) /* Provide dummy implementation if threads are not supported. */ |