fix the use of the old __THREAD__ macro
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7976 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
f7efce9b3e
commit
1ededbc0cf
1 changed files with 14 additions and 9 deletions
|
|
@ -305,6 +305,13 @@ namespace Swig {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#if defined(SWIG_PYTHON_THREADS)
|
||||||
|
/* __THREAD__ is the old macro to activate some thread support */
|
||||||
|
# if !defined(__THREAD__)
|
||||||
|
# define __THREAD__
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/* simple thread abstraction for pthreads on win32 */
|
/* simple thread abstraction for pthreads on win32 */
|
||||||
#ifdef __THREAD__
|
#ifdef __THREAD__
|
||||||
# define __PTHREAD__
|
# define __PTHREAD__
|
||||||
|
|
@ -313,19 +320,13 @@ namespace Swig {
|
||||||
# define pthread_mutex_unlock LeaveCriticalSection
|
# define pthread_mutex_unlock LeaveCriticalSection
|
||||||
# define pthread_mutex_t CRITICAL_SECTION
|
# define pthread_mutex_t CRITICAL_SECTION
|
||||||
# define SWIG_MUTEX_INIT(var) var
|
# define SWIG_MUTEX_INIT(var) var
|
||||||
# endif
|
|
||||||
# else
|
# else
|
||||||
# include <pthread.h>
|
# include <pthread.h>
|
||||||
# define SWIG_MUTEX_INIT(var) var = PTHREAD_MUTEX_INITIALIZER
|
# define SWIG_MUTEX_INIT(var) var = PTHREAD_MUTEX_INITIALIZER
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
#ifdef __PTHREAD__
|
|
||||||
# define SWIG_GUARD(mutex) Guard _guard(mutex)
|
|
||||||
#else
|
|
||||||
# define SWIG_GUARD(mutex)
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __PTHREAD__
|
||||||
struct Guard
|
struct Guard
|
||||||
{
|
{
|
||||||
pthread_mutex_t *_mutex;
|
pthread_mutex_t *_mutex;
|
||||||
|
|
@ -340,6 +341,10 @@ namespace Swig {
|
||||||
pthread_mutex_unlock(_mutex);
|
pthread_mutex_unlock(_mutex);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
# define SWIG_GUARD(mutex) Guard _guard(mutex)
|
||||||
|
#else
|
||||||
|
# define SWIG_GUARD(mutex)
|
||||||
|
#endif
|
||||||
|
|
||||||
/* director base class */
|
/* director base class */
|
||||||
class Director {
|
class Director {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue