Fix include warnings on some platforms and use PTHREAD_MUTEX_RECURSIV…

…E instead of PTHREAD_MUTEX_RECURSIVE_NP
babelouest · Jan 16, 2018 · eb93364 · eb93364
1 parent 077f922
commit eb93364
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -26,7 +26,7 @@ CC=gcc
 CFLAGS=-c -pedantic -std=gnu99 -fPIC -Wall -D_REENTRANT -I$(PREFIX)/include -I$(LIBORCANIA_LOCATION) -I$(LIBYDER_LOCATION) $(ADDITIONALFLAGS) $(JANSSONFLAG) $(CURLFLAG) $(WEBSOCKETFLAG)
 LIBS=-L$(PREFIX)/lib -L$(LIBORCANIA_LOCATION) -L$(LIBYDER_LOCATION) -lc -lmicrohttpd -lyder -lorcania -lpthread
 OUTPUT=libulfius.so
-VERSION=2.2.2
+VERSION=2.2.3
 
 ifndef JANSSONFLAG
 LJANSSON=-ljansson

diff --git a/src/u_websocket.c b/src/u_websocket.c
@@ -112,7 +112,7 @@ void * ulfius_thread_websocket(void * data) {
 
   if (websocket != NULL && websocket->websocket_manager != NULL) {
     pthread_mutexattr_init ( &mutexattr );
-    pthread_mutexattr_settype( &mutexattr, PTHREAD_MUTEX_RECURSIVE_NP );
+    pthread_mutexattr_settype( &mutexattr, PTHREAD_MUTEX_RECURSIVE );
     if (pthread_mutex_init(&(websocket->websocket_manager->read_lock), &mutexattr) != 0 || pthread_mutex_init(&(websocket->websocket_manager->write_lock), &mutexattr) != 0) {
       y_log_message(Y_LOG_LEVEL_ERROR, "Impossible to initialize Mutex Lock for websocket");
       websocket->websocket_manager->connected = 0;

diff --git a/src/ulfius.h b/src/ulfius.h
@@ -27,7 +27,7 @@
 #define __ULFIUS_H__
 
 /** External dependencies **/
-#include <sys/poll.h>
+#include <poll.h>
 #include <pthread.h>
 #include <microhttpd.h>
 
@@ -56,7 +56,7 @@
 #define U_ERROR_LIBCURL      5 // Error in libcurl execution
 #define U_ERROR_NOT_FOUND    6 // Something was not found
 
-#define ULFIUS_VERSION 2.2.2
+#define ULFIUS_VERSION 2.2.3
 
 #define U_CALLBACK_CONTINUE     0
 #define U_CALLBACK_COMPLETE     1