generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation on GNU/Hurd

Browse Source 
(cherry picked from commit 89ad5e67791f947ea6a13c83dbdd0bc02184b231)
This commit is contained in:
Pino Toscano 2013-10-28 14:01:11 -02:00 committed by Marcelo Roberto Jimenez
parent 4e87527eb6
commit 89d34af3bd
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -357,6 +357,10 @@ Version 1.8.0
Version 1.6.19 Version 1.6.19
******************************************************************************* *******************************************************************************
2013-10-28 Pino Toscano <pinotree(at)users.sourceforge.net>
Fix compilation on GNU/Hurd
2013-10-28 Peng <howtofly(at)gmail.com> 2013-10-28 Peng <howtofly(at)gmail.com>
Fix return value of http_RecvPostMessage and update httpparser.c's comments Fix return value of http_RecvPostMessage and update httpparser.c's comments

1
THANKS
View File

@ -56,6 +56,7 @@ exempt of errors.
- Paul Vixie - Paul Vixie
- Peng - Peng
- Peter Hartley - Peter Hartley
- Pino Toscano (pinotree)
- Rene Hexel - Rene Hexel
- Robert Buckley (rbuckley) - Robert Buckley (rbuckley)
- Robert Gingher (robsbox) - Robert Gingher (robsbox)

2
threadutil/inc/ithread.h
View File

@ -50,7 +50,7 @@ extern "C" {
#include <pthread.h> #include <pthread.h>
#if defined(BSD) #if defined(BSD) && !defined(__GNU__)
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
#endif #endif

6
upnp/src/ssdp/ssdp_server.c
View File

@ -814,7 +814,7 @@ static int create_ssdp_sock_v4(
ret = UPNP_E_SOCKET_ERROR; ret = UPNP_E_SOCKET_ERROR;
goto error_handler; goto error_handler;
} }
#if defined(BSD) || defined(__OSX__) || defined(__APPLE__) #if (defined(BSD) && !defined(__GNU__)) || defined(__OSX__) || defined(__APPLE__)
onOff = 1; onOff = 1;
ret = setsockopt(*ssdpSock, SOL_SOCKET, SO_REUSEPORT, ret = setsockopt(*ssdpSock, SOL_SOCKET, SO_REUSEPORT,
(char *)&onOff, sizeof(onOff)); (char *)&onOff, sizeof(onOff));
@ -956,7 +956,7 @@ static int create_ssdp_sock_v6(
ret = UPNP_E_SOCKET_ERROR; ret = UPNP_E_SOCKET_ERROR;
goto error_handler; goto error_handler;
} }
#if defined(BSD) || defined(__OSX__) || defined(__APPLE__) #if (defined(BSD) && !defined(__GNU__)) || defined(__OSX__) || defined(__APPLE__)
onOff = 1; onOff = 1;
ret = setsockopt(*ssdpSock, SOL_SOCKET, SO_REUSEPORT, ret = setsockopt(*ssdpSock, SOL_SOCKET, SO_REUSEPORT,
(char *)&onOff, sizeof(onOff)); (char *)&onOff, sizeof(onOff));
@ -1069,7 +1069,7 @@ static int create_ssdp_sock_v6_ula_gua(
ret = UPNP_E_SOCKET_ERROR; ret = UPNP_E_SOCKET_ERROR;
goto error_handler; goto error_handler;
} }
#if defined(BSD) || defined(__OSX__) || defined(__APPLE__) #if (defined(BSD) && !defined(__GNU__)) || defined(__OSX__) || defined(__APPLE__)
onOff = 1; onOff = 1;
ret = setsockopt(*ssdpSock, SOL_SOCKET, SO_REUSEPORT, ret = setsockopt(*ssdpSock, SOL_SOCKET, SO_REUSEPORT,
(char *)&onOff, sizeof(onOff)); (char *)&onOff, sizeof(onOff));