SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401938
This commit is contained in:
parent
91a32b77a2
commit
0f030a1802
686 changed files with 117556 additions and 98661 deletions
|
@ -29,67 +29,74 @@
|
|||
#include "SDL_mutex.h"
|
||||
|
||||
|
||||
struct SDL_mutex {
|
||||
HANDLE id;
|
||||
struct SDL_mutex
|
||||
{
|
||||
HANDLE id;
|
||||
};
|
||||
|
||||
/* Create a mutex */
|
||||
SDL_mutex *SDL_CreateMutex(void)
|
||||
SDL_mutex *
|
||||
SDL_CreateMutex(void)
|
||||
{
|
||||
SDL_mutex *mutex;
|
||||
SDL_mutex *mutex;
|
||||
|
||||
/* Allocate mutex memory */
|
||||
mutex = (SDL_mutex *)SDL_malloc(sizeof(*mutex));
|
||||
if ( mutex ) {
|
||||
/* Create the mutex, with initial value signaled */
|
||||
mutex->id = CreateMutex(NULL, FALSE, NULL);
|
||||
if ( ! mutex->id ) {
|
||||
SDL_SetError("Couldn't create mutex");
|
||||
SDL_free(mutex);
|
||||
mutex = NULL;
|
||||
}
|
||||
} else {
|
||||
SDL_OutOfMemory();
|
||||
}
|
||||
return(mutex);
|
||||
/* Allocate mutex memory */
|
||||
mutex = (SDL_mutex *) SDL_malloc(sizeof(*mutex));
|
||||
if (mutex) {
|
||||
/* Create the mutex, with initial value signaled */
|
||||
mutex->id = CreateMutex(NULL, FALSE, NULL);
|
||||
if (!mutex->id) {
|
||||
SDL_SetError("Couldn't create mutex");
|
||||
SDL_free(mutex);
|
||||
mutex = NULL;
|
||||
}
|
||||
} else {
|
||||
SDL_OutOfMemory();
|
||||
}
|
||||
return (mutex);
|
||||
}
|
||||
|
||||
/* Free the mutex */
|
||||
void SDL_DestroyMutex(SDL_mutex *mutex)
|
||||
void
|
||||
SDL_DestroyMutex(SDL_mutex * mutex)
|
||||
{
|
||||
if ( mutex ) {
|
||||
if ( mutex->id ) {
|
||||
CloseHandle(mutex->id);
|
||||
mutex->id = 0;
|
||||
}
|
||||
SDL_free(mutex);
|
||||
}
|
||||
if (mutex) {
|
||||
if (mutex->id) {
|
||||
CloseHandle(mutex->id);
|
||||
mutex->id = 0;
|
||||
}
|
||||
SDL_free(mutex);
|
||||
}
|
||||
}
|
||||
|
||||
/* Lock the mutex */
|
||||
int SDL_mutexP(SDL_mutex *mutex)
|
||||
int
|
||||
SDL_mutexP(SDL_mutex * mutex)
|
||||
{
|
||||
if ( mutex == NULL ) {
|
||||
SDL_SetError("Passed a NULL mutex");
|
||||
return -1;
|
||||
}
|
||||
if ( WaitForSingleObject(mutex->id, INFINITE) == WAIT_FAILED ) {
|
||||
SDL_SetError("Couldn't wait on mutex");
|
||||
return -1;
|
||||
}
|
||||
return(0);
|
||||
if (mutex == NULL) {
|
||||
SDL_SetError("Passed a NULL mutex");
|
||||
return -1;
|
||||
}
|
||||
if (WaitForSingleObject(mutex->id, INFINITE) == WAIT_FAILED) {
|
||||
SDL_SetError("Couldn't wait on mutex");
|
||||
return -1;
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* Unlock the mutex */
|
||||
int SDL_mutexV(SDL_mutex *mutex)
|
||||
int
|
||||
SDL_mutexV(SDL_mutex * mutex)
|
||||
{
|
||||
if ( mutex == NULL ) {
|
||||
SDL_SetError("Passed a NULL mutex");
|
||||
return -1;
|
||||
}
|
||||
if ( ReleaseMutex(mutex->id) == FALSE ) {
|
||||
SDL_SetError("Couldn't release mutex");
|
||||
return -1;
|
||||
}
|
||||
return(0);
|
||||
if (mutex == NULL) {
|
||||
SDL_SetError("Passed a NULL mutex");
|
||||
return -1;
|
||||
}
|
||||
if (ReleaseMutex(mutex->id) == FALSE) {
|
||||
SDL_SetError("Couldn't release mutex");
|
||||
return -1;
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* vi: set ts=4 sw=4 expandtab: */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue