From b883cc55a48c3ff6fb70953e1778e94d07c2737e Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Fri, 19 Oct 2012 20:09:17 -0700
Subject: [PATCH] Fix rules around pthread usage to fix clang warning.

---
 configure.ac   | 25 ++++++++++++-------------
 src/internal.c | 10 +++++++---
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index e4427b766..3858966fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,12 +119,18 @@ fi
 AC_ARG_ENABLE(singleThreaded,
     [  --enable-singleThreaded Enable CyaSSL single threaded (default: disabled)],
     [ ENABLED_SINGLETHREADED=$enableval ],
-    [ ENABLED_SINGLETHREADED=no ]
-    )
-if test "$ENABLED_SINGLETHREADED" = "yes"
-then
-  AM_CFLAGS="-DSINGLE_THREADED $AM_CFLAGS"
-fi
+    [ ENABLED_SINGLETHREADED=no ])
+
+AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xno" ],[
+       AX_PTHREAD([
+                   AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
+                   AM_CFLAGS="-D_POSIX_THREADS $AM_CFLAGS"
+                   ],[
+                      ENABLED_SINGLETHREADED=yes
+                      ])
+       ])
+
+AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xyes" ],[ AM_CFLAGS="-DSINGLE_THREADED $AM_CFLAGS" ])
 
 
 # DTLS
@@ -663,13 +669,6 @@ then
     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
 
 AC_ARG_ENABLE(gcc-hardening,
diff --git a/src/internal.c b/src/internal.c
index c60e982f6..94b852192 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -7591,24 +7591,28 @@ int SetCipherList(Suites* s, const char* list)
 
 int InitMutex(CyaSSL_Mutex* m)
 {
+    (void)m;
     return 0;
 }
 
 
-int FreeMutex(CyaSSL_Mutex* m)
+int FreeMutex(CyaSSL_Mutex *m)
 {
+    (void)m;
     return 0;
 }
 
 
-int LockMutex(CyaSSL_Mutex* m)
+int LockMutex(CyaSSL_Mutex *m)
 {
+    (void)m;
     return 0;
 }
 
 
-int UnLockMutex(CyaSSL_Mutex* m)
+int UnLockMutex(CyaSSL_Mutex *m)
 {
+    (void)m;
     return 0;
 }