5 files changed, 16 insertions, 9 deletions
diff --git a/Source/CTest/Curl/CMakeLists.txt b/Source/CTest/Curl/CMakeLists.txt
index 88ddc4a..1592112 100644
--- a/Source/CTest/Curl/CMakeLists.txt
+++ b/Source/CTest/Curl/CMakeLists.txt
@@ -416,5 +416,7 @@ IF(CURL_TESTING)
   SUBDIRS(Testing)
 ENDIF(CURL_TESTING)
 
-ADD_EXECUTABLE(LIBCURL Testing/curltest.c)
-TARGET_LINK_LIBRARIES(LIBCURL Curl)
+IF(NOT CMAKE_BUILD_WITH_CURL)
+  ADD_EXECUTABLE(LIBCURL Testing/curltest.c)
+  TARGET_LINK_LIBRARIES(LIBCURL Curl)
+ENDIF(NOT CMAKE_BUILD_WITH_CURL)
diff --git a/Source/CTest/Curl/formdata.c b/Source/CTest/Curl/formdata.c
index fabead8..36569bf 100644
--- a/Source/CTest/Curl/formdata.c
+++ b/Source/CTest/Curl/formdata.c
@@ -876,10 +876,15 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
       {
         /* this "cast increases required alignment of target type" but
            we consider it OK anyway */
-        struct curl_slist* list = array_state?
-          (struct curl_slist*)array_value:
-          va_arg(params, struct curl_slist*);
-        
+        struct curl_slist* list;
+        if ( array_state )
+          {
+          memcpy(list, array_value, sizeof(struct curl_slist*));
+          }
+        else
+          {
+          list = va_arg(params, struct curl_slist*);
+          }
         if( current_form->contentheader )
           return_value = CURL_FORMADD_OPTION_TWICE;
         else
diff --git a/Source/CTest/Curl/getdate.c b/Source/CTest/Curl/getdate.c
index 14edfed..6cece1f 100644
--- a/Source/CTest/Curl/getdate.c
+++ b/Source/CTest/Curl/getdate.c
@@ -1795,7 +1795,7 @@ LookupWord (yylval, buff)
 
   /* Make it lowercase. */
   for (p = buff; *p; p++)
-    if (ISUPPER ((unsigned char) *p))
+    if (ISUPPER ((unsigned int)(*p)))
       *p = (char)tolower (*p);
 
   if (strcmp (buff, "am") == 0 || strcmp (buff, "a.m.") == 0)
diff --git a/Source/CTest/Curl/multi.c b/Source/CTest/Curl/multi.c
index 8548354..5ccd337 100644
--- a/Source/CTest/Curl/multi.c
+++ b/Source/CTest/Curl/multi.c
@@ -174,7 +174,7 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
   /* scan through the list and remove the 'curl_handle' */
   easy = multi->easy.next;
   while(easy) {
-    if(easy->easy_handle == curl_handle)
+    if((CURL*)(easy->easy_handle) == curl_handle)
       break;
     easy=easy->next;
   }
diff --git a/Source/CTest/Curl/url.c b/Source/CTest/Curl/url.c
index 6714a79..5d9250b 100644
--- a/Source/CTest/Curl/url.c
+++ b/Source/CTest/Curl/url.c
@@ -973,10 +973,10 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
         }
       }
     }
+    break;
 #else
     return CURLE_SSL_ENGINE_NOTFOUND;
 #endif
-    break;
   case CURLOPT_SSLENGINE_DEFAULT:
     /*
      * flag to set engine as default.