mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Include the system header file "pthread.h" even in a non-threaded build.
Fixes bug#15861 include/my_no_pthread.h: Even in a non-threaded build, some modules (at least "mysys/mf_keycache.c") need some type definitions provided by the system header file "pthread.h". Rather than add complexity to the code, include the header. Fixes bug#15861
This commit is contained in:
@@ -14,15 +14,34 @@
|
|||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||||
|
|
||||||
|
|
||||||
|
#if !defined(_my_no_pthread_h) && !defined(THREAD)
|
||||||
|
#define _my_no_pthread_h
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
This block is to access some thread-related type definitions
|
||||||
|
even in builds which do not need thread functions,
|
||||||
|
as some variables (based on these types) are declared
|
||||||
|
even in non-threaded builds.
|
||||||
|
Case in point: 'mf_keycache.c'
|
||||||
|
*/
|
||||||
|
#if defined(__WIN__) || defined(OS2)
|
||||||
|
|
||||||
|
#elif defined(HAVE_UNIXWARE7_THREADS)
|
||||||
|
/* #include <thread.h> Currently, not relevant. Enable if needed. */
|
||||||
|
|
||||||
|
#else /* Normal threads */
|
||||||
|
#include <pthread.h>
|
||||||
|
|
||||||
|
#endif /* defined(__WIN__) */
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
This undefs some pthread mutex locks when one isn't using threads
|
This undefs some pthread mutex locks when one isn't using threads
|
||||||
to make thread safe code, that should also work in single thread
|
to make thread safe code, that should also work in single thread
|
||||||
environment, easier to use.
|
environment, easier to use.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if !defined(_my_no_pthread_h) && !defined(THREAD)
|
|
||||||
#define _my_no_pthread_h
|
|
||||||
|
|
||||||
#define pthread_mutex_init(A,B)
|
#define pthread_mutex_init(A,B)
|
||||||
#define pthread_mutex_lock(A)
|
#define pthread_mutex_lock(A)
|
||||||
#define pthread_mutex_unlock(A)
|
#define pthread_mutex_unlock(A)
|
||||||
@@ -32,4 +51,5 @@
|
|||||||
#define rw_wrlock(A)
|
#define rw_wrlock(A)
|
||||||
#define rw_unlock(A)
|
#define rw_unlock(A)
|
||||||
#define rwlock_destroy(A)
|
#define rwlock_destroy(A)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user