projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
several bug fixes and minor feature changes:
[goodguy/history.git]
/
cinelerra-5.0
/
guicast
/
mutex.C
diff --git
a/cinelerra-5.0/guicast/mutex.C
b/cinelerra-5.0/guicast/mutex.C
index 9b993fe812fe9aa08c9bf9806b8d03e93b36de62..a4a6e21f99f605c1e30fe7a7ffb6092cad5ab40b 100644
(file)
--- a/
cinelerra-5.0/guicast/mutex.C
+++ b/
cinelerra-5.0/guicast/mutex.C
@@
-19,11
+19,15
@@
*
*/
*
*/
+#include <stdio.h>
+#include <errno.h>
+
#ifndef NO_GUICAST
#include "bcsignals.h"
#endif
#include "mutex.h"
#ifndef NO_GUICAST
#include "bcsignals.h"
#endif
#include "mutex.h"
+
Mutex::Mutex(const char *title, int recursive)
{
this->title = title;
Mutex::Mutex(const char *title, int recursive)
{
this->title = title;
@@
-122,6
+126,7
@@
int Mutex::unlock()
int Mutex::trylock(const char *location)
{
int Mutex::trylock(const char *location)
{
+ if( count ) return EBUSY;
int ret = pthread_mutex_trylock(&mutex);
if( ret ) return ret;
int ret = pthread_mutex_trylock(&mutex);
if( ret ) return ret;