comparison include/SDL_mutex.h @ 4661:03dcb795c583

Merged changes from the main SDL codebase
author Sam Lantinga <slouken@libsdl.org>
date Mon, 12 Jul 2010 21:09:23 -0700
parents f67139f6d87f
children 0846f18eb625
comparison
equal deleted inserted replaced
4660:b15e7017409b 4661:03dcb795c583
192 * 192 *
193 * The mutex is re-locked once the condition variable is signaled. 193 * The mutex is re-locked once the condition variable is signaled.
194 * 194 *
195 * \return 0 when it is signaled, or -1 on error. 195 * \return 0 when it is signaled, or -1 on error.
196 */ 196 */
197 extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mut); 197 extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex);
198 198
199 /** 199 /**
200 * Waits for at most \c ms milliseconds, and returns 0 if the condition 200 * Waits for at most \c ms milliseconds, and returns 0 if the condition
201 * variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not 201 * variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not
202 * signaled in the allotted time, and -1 on error. 202 * signaled in the allotted time, and -1 on error.