diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-11-17 23:03:16 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-11-17 23:03:16 +0000 |
| commit | 42b08b4eb850bea20f891e0d22b5cf7130f1e252 (patch) | |
| tree | fb5423e54d8c3b7806f85c82d1c687e45a6b3fb4 /include | |
| parent | 19460802ef09d57084773f285cf138e566b1a200 (diff) | |
Use autoconf logic to determine the presence of PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP and PTHREAD_MUTEX_RECURSIVE_NP. Enclose error message from network.h in "
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89394 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 13 | ||||
| -rw-r--r-- | include/asterisk/lock.h | 2 | ||||
| -rw-r--r-- | include/asterisk/network.h | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 5be612e44..00dbd9fbf 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -562,6 +562,19 @@ /* Define if you have POSIX threads libraries and header files. */ #undef HAVE_PTHREAD +/* Define if your system has the PTHREAD_MUTEX_RECURSIVE_NP headers. */ +#undef HAVE_PTHREAD_MUTEX_RECURSIVE_NP + +/* Define PTHREAD_MUTEX_RECURSIVE_NP headers version */ +#undef HAVE_PTHREAD_MUTEX_RECURSIVE_NP_VERSION + +/* Define if your system has the PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP + headers. */ +#undef HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP + +/* Define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP headers version */ +#undef HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP_VERSION + /* Define if your system has the PTHREAD_RWLOCK_INITIALIZER headers. */ #undef HAVE_PTHREAD_RWLOCK_INITIALIZER diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index f22911d14..16ce5bb67 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -81,7 +81,7 @@ /* Asterisk REQUIRES recursive (not error checking) mutexes and will not run without them. */ -#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) && defined(PTHREAD_MUTEX_RECURSIVE_NP) +#if defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) && defined(HAVE_PTHREAD_MUTEX_RECURSIVE_NP) #define PTHREAD_MUTEX_INIT_VALUE PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP #else diff --git a/include/asterisk/network.h b/include/asterisk/network.h index bc7962be7..23778ad7f 100644 --- a/include/asterisk/network.h +++ b/include/asterisk/network.h @@ -52,7 +52,7 @@ typedef int socklen_t; #include <winsock2.h> #include <ws2tcpip.h> #else -#error don't know how to handle network functions here. +#error "don't know how to handle network functions here." #endif #ifndef HAVE_INET_ATON |