Fix rules around pthread usage to fix clang warning.

pull/1/head
Brian Aker 2012-10-19 20:09:17 -07:00
parent 1bc0dc53f9
commit b883cc55a4
2 changed files with 19 additions and 16 deletions

View File

@ -119,12 +119,18 @@ fi
AC_ARG_ENABLE(singleThreaded, AC_ARG_ENABLE(singleThreaded,
[ --enable-singleThreaded Enable CyaSSL single threaded (default: disabled)], [ --enable-singleThreaded Enable CyaSSL single threaded (default: disabled)],
[ ENABLED_SINGLETHREADED=$enableval ], [ ENABLED_SINGLETHREADED=$enableval ],
[ ENABLED_SINGLETHREADED=no ] [ ENABLED_SINGLETHREADED=no ])
)
if test "$ENABLED_SINGLETHREADED" = "yes" AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xno" ],[
then AX_PTHREAD([
AM_CFLAGS="-DSINGLE_THREADED $AM_CFLAGS" AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
fi AM_CFLAGS="-D_POSIX_THREADS $AM_CFLAGS"
],[
ENABLED_SINGLETHREADED=yes
])
])
AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xyes" ],[ AM_CFLAGS="-DSINGLE_THREADED $AM_CFLAGS" ])
# DTLS # DTLS
@ -663,13 +669,6 @@ then
fi fi
fi fi
AX_PTHREAD([
AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
],
[
AC_DEFINE([HAVE_PTHREAD], [0], [Define if you have POSIX threads libraries and header files.])
])
LIB_SOCKET_NSL LIB_SOCKET_NSL
AC_ARG_ENABLE(gcc-hardening, AC_ARG_ENABLE(gcc-hardening,

View File

@ -7591,24 +7591,28 @@ int SetCipherList(Suites* s, const char* list)
int InitMutex(CyaSSL_Mutex* m) int InitMutex(CyaSSL_Mutex* m)
{ {
(void)m;
return 0; return 0;
} }
int FreeMutex(CyaSSL_Mutex* m) int FreeMutex(CyaSSL_Mutex *m)
{ {
(void)m;
return 0; return 0;
} }
int LockMutex(CyaSSL_Mutex* m) int LockMutex(CyaSSL_Mutex *m)
{ {
(void)m;
return 0; return 0;
} }
int UnLockMutex(CyaSSL_Mutex* m) int UnLockMutex(CyaSSL_Mutex *m)
{ {
(void)m;
return 0; return 0;
} }