Made sure to pass longs in to curl_easy_setopt where necessary in the

libtest code.

36 files changed, 92 insertions, 88 deletions

diff --git a/CHANGES b/CHANGES
index cb53ab53d..7112efc58 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
                                   Changelog
 
 
+Daniel Fandrich (22 May 2008)
+- Made sure to pass longs in to curl_easy_setopt where necessary in the
+  example programs and libtest code.
+
 Daniel Stenberg (19 May 2008)
 - When trying to repeat a multi interface problem I fell over a few multi
   interface problems:
diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c
index 9ee164e2c..d22aecdbc 100644
--- a/tests/libtest/lib500.c
+++ b/tests/libtest/lib500.c
@@ -27,7 +27,7 @@ int test(char *URL)
   }
 
   curl_easy_setopt(curl, CURLOPT_URL, URL);
-  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
 
   res = curl_easy_perform(curl);
 
diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c
index a4d78159d..cf2d95724 100644
--- a/tests/libtest/lib501.c
+++ b/tests/libtest/lib501.c
@@ -28,7 +28,7 @@ int test(char *URL)
     return TEST_ERR_MAJOR_BAD;
   }
 
-  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
 
   res = curl_easy_perform(curl);
 
diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c
index 327402242..5eda5996e 100644
--- a/tests/libtest/lib503.c
+++ b/tests/libtest/lib503.c
@@ -52,8 +52,8 @@ int test(char *URL)
   curl_easy_setopt(c, CURLOPT_URL, URL);
   curl_easy_setopt(c, CURLOPT_USERPWD, "test:ing");
   curl_easy_setopt(c, CURLOPT_PROXYUSERPWD, "test:ing");
-  curl_easy_setopt(c, CURLOPT_HTTPPROXYTUNNEL, 1);
-  curl_easy_setopt(c, CURLOPT_HEADER, 1);
+  curl_easy_setopt(c, CURLOPT_HTTPPROXYTUNNEL, 1L);
+  curl_easy_setopt(c, CURLOPT_HEADER, 1L);
 
   if ((m = curl_multi_init()) == NULL) {
     fprintf(stderr, "curl_multi_init() failed\n");
diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c
index a6e988657..a57a3d157 100644
--- a/tests/libtest/lib504.c
+++ b/tests/libtest/lib504.c
@@ -55,7 +55,7 @@ int test(char *URL)
      proxy port */
   curl_easy_setopt(c, CURLOPT_PROXY, libtest_arg2);
   curl_easy_setopt(c, CURLOPT_URL, URL);
-  curl_easy_setopt(c, CURLOPT_VERBOSE, 1);
+  curl_easy_setopt(c, CURLOPT_VERBOSE, 1L);
 
   if ((m = curl_multi_init()) == NULL) {
     fprintf(stderr, "curl_multi_init() failed\n");
diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c
index d2698faa9..eec2071c9 100644
--- a/tests/libtest/lib505.c
+++ b/tests/libtest/lib505.c
@@ -116,10 +116,10 @@ int test(char *URL)
   headerlist = hl;
 
   /* enable uploading */
-  curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE) ;
+  curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
 
   /* enable verbose */
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE) ;
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   /* specify target */
   curl_easy_setopt(curl,CURLOPT_URL, URL);
diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index 4bec2884f..cadd2ee63 100644
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@@ -106,7 +106,7 @@ static void *fire(void *ptr)
   }
 
   headers = sethost(NULL);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE,    1);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE,    1L);
   curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
   curl_easy_setopt(curl, CURLOPT_URL,        tdata->url);
   printf( "CURLOPT_SHARE\n" );
diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c
index ecbc41912..35679d180 100644
--- a/tests/libtest/lib508.c
+++ b/tests/libtest/lib508.c
@@ -59,7 +59,7 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_URL, URL);
 
   /* Now specify we want to POST data */
-  curl_easy_setopt(curl, CURLOPT_POST, TRUE);
+  curl_easy_setopt(curl, CURLOPT_POST, 1L);
 
   /* Set the expected POST size */
   curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)pooh.sizeleft);
@@ -71,10 +71,10 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_INFILE, &pooh);
 
   /* get verbose debug output please */
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   /* include headers in the output */
-  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
 
   /* Perform the request, res will get the return code */
   res = curl_easy_perform(curl);
diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c
index 53797473c..d8644c3fa 100644
--- a/tests/libtest/lib510.c
+++ b/tests/libtest/lib510.c
@@ -74,7 +74,7 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_URL, URL);
 
   /* Now specify we want to POST data */
-  curl_easy_setopt(curl, CURLOPT_POST, TRUE);
+  curl_easy_setopt(curl, CURLOPT_POST, 1L);
 
   /* we want to use our own read function */
   curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
@@ -83,10 +83,10 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_INFILE, &pooh);
 
   /* get verbose debug output please */
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   /* include headers in the output */
-  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
 
   /* enforce chunked transfer by setting the header */
   curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
diff --git a/tests/libtest/lib511.c b/tests/libtest/lib511.c
index 7fcdebf93..b0f455d59 100644
--- a/tests/libtest/lib511.c
+++ b/tests/libtest/lib511.c
@@ -27,9 +27,9 @@ int test(char *URL)
   }
 
   curl_easy_setopt(curl, CURLOPT_URL, URL);
-  curl_easy_setopt(curl, CURLOPT_FILETIME, 1);
-  curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+  curl_easy_setopt(curl, CURLOPT_FILETIME, 1L);
+  curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   res = curl_easy_perform(curl);
 
diff --git a/tests/libtest/lib512.c b/tests/libtest/lib512.c
index 1d7d02a6a..0af95919b 100644
--- a/tests/libtest/lib512.c
+++ b/tests/libtest/lib512.c
@@ -26,8 +26,8 @@ int test(char *URL)
     curl = curl_easy_init();
     if(curl) {
 
-      curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-      curl_easy_setopt(curl, CURLOPT_HEADER, 1);
+      curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+      curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
 
       curl2 = curl_easy_duphandle(curl);
       if(curl2) {
diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c
index 4cb593cec..d6f3756b7 100644
--- a/tests/libtest/lib513.c
+++ b/tests/libtest/lib513.c
@@ -39,10 +39,10 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_URL, URL);
 
   /* Now specify we want to POST data */
-  curl_easy_setopt(curl, CURLOPT_POST, TRUE);
+  curl_easy_setopt(curl, CURLOPT_POST, 1L);
 
   /* Set the expected POST size */
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 1);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 1L);
 
   /* we want to use our own read function */
   curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
@@ -51,10 +51,10 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_INFILE, NULL);
 
   /* get verbose debug output please */
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   /* include headers in the output */
-  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
 
   /* Perform the request, res will get the return code */
   res = curl_easy_perform(curl);
diff --git a/tests/libtest/lib514.c b/tests/libtest/lib514.c
index 93d576fbd..419b8422a 100644
--- a/tests/libtest/lib514.c
+++ b/tests/libtest/lib514.c
@@ -39,16 +39,16 @@ int test(char *URL)
   */
 
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, "moo");
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 3);
-  curl_easy_setopt(curl, CURLOPT_POST, 1);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 3L);
+  curl_easy_setopt(curl, CURLOPT_POST, 1L);
 
   /* this is where transfer 1 would take place, but skip that and change
      options right away instead */
 
-  curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
+  curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
 
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); /* show verbose for debug */
-  curl_easy_setopt(curl, CURLOPT_HEADER, 1); /* include header */
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); /* show verbose for debug */
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L); /* include header */
 
   /* Now, we should be making a fine HEAD request */
 
diff --git a/tests/libtest/lib515.c b/tests/libtest/lib515.c
index 6086ecb09..18df7c938 100644
--- a/tests/libtest/lib515.c
+++ b/tests/libtest/lib515.c
@@ -29,9 +29,9 @@ int test(char *URL)
   /* First set the URL that is about to receive our POST. */
   curl_easy_setopt(curl, CURLOPT_URL, URL);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, NULL);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 0);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); /* show verbose for debug */
-  curl_easy_setopt(curl, CURLOPT_HEADER, 1); /* include header */
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 0L);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); /* show verbose for debug */
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L); /* include header */
 
   /* Now, we should be making a zero byte POST request */
   res = curl_easy_perform(curl);
diff --git a/tests/libtest/lib516.c b/tests/libtest/lib516.c
index 5eaa140e6..8295699e3 100644
--- a/tests/libtest/lib516.c
+++ b/tests/libtest/lib516.c
@@ -29,8 +29,8 @@ int test(char *URL)
   /* First set the URL that is about to receive our POST. */
   curl_easy_setopt(curl, CURLOPT_URL, URL);
   curl_easy_setopt(curl, CURLOPT_HTTPPOST, NULL);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); /* show verbose for debug */
-  curl_easy_setopt(curl, CURLOPT_HEADER, 1); /* include header */
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); /* show verbose for debug */
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L); /* include header */
 
   /* Now, we should be making a zero byte POST request */
   res = curl_easy_perform(curl);
diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c
index 22680688b..41c3fe282 100644
--- a/tests/libtest/lib518.c
+++ b/tests/libtest/lib518.c
@@ -483,7 +483,7 @@ int test(char *URL)
   }
 
   curl_easy_setopt(curl, CURLOPT_URL, URL);
-  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
 
   res = curl_easy_perform(curl);
 
diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c
index 58f38150d..ce440485a 100644
--- a/tests/libtest/lib519.c
+++ b/tests/libtest/lib519.c
@@ -28,8 +28,8 @@ int test(char *URL)
 
   curl_easy_setopt(curl, CURLOPT_URL, URL);
   curl_easy_setopt(curl, CURLOPT_USERPWD, "monster:underbed");
-  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   /* get first page */
   res = curl_easy_perform(curl);
diff --git a/tests/libtest/lib520.c b/tests/libtest/lib520.c
index a673007a6..46cad415d 100644
--- a/tests/libtest/lib520.c
+++ b/tests/libtest/lib520.c
@@ -27,8 +27,8 @@ int test(char *URL)
   }
 
   curl_easy_setopt(curl, CURLOPT_URL, URL);
-  curl_easy_setopt(curl, CURLOPT_FILETIME, 1);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+  curl_easy_setopt(curl, CURLOPT_FILETIME, 1L);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   res = curl_easy_perform(curl);
 
diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c
index 7301e3cd1..346ece056 100644
--- a/tests/libtest/lib521.c
+++ b/tests/libtest/lib521.c
@@ -29,7 +29,7 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_URL, URL);
   curl_easy_setopt(curl, CURLOPT_PORT, atoi(libtest_arg2));
   curl_easy_setopt(curl, CURLOPT_USERPWD, "xxx:yyy");
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   res = curl_easy_perform(curl);
 
diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c
index c6c8e2e31..9f485ffed 100644
--- a/tests/libtest/lib523.c
+++ b/tests/libtest/lib523.c
@@ -28,9 +28,9 @@ int test(char *URL)
 
   curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg2);
   curl_easy_setopt(curl, CURLOPT_URL, URL);
-  curl_easy_setopt(curl, CURLOPT_PORT, 19999);
+  curl_easy_setopt(curl, CURLOPT_PORT, 19999L);
   curl_easy_setopt(curl, CURLOPT_USERPWD, "xxx:yyy");
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   res = curl_easy_perform(curl);
 
diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c
index 55f29784c..2fde663ca 100644
--- a/tests/libtest/lib524.c
+++ b/tests/libtest/lib524.c
@@ -27,8 +27,8 @@ int test(char *URL)
   }
 
   curl_easy_setopt(curl, CURLOPT_URL, URL);
-  curl_easy_setopt(curl, CURLOPT_UPLOAD, 1);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
+  curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   res = curl_easy_perform(curl);
 
diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c
index 222f8c278..154c209e3 100644
--- a/tests/libtest/lib525.c
+++ b/tests/libtest/lib525.c
@@ -71,13 +71,13 @@ int test(char *URL)
   }
 
   /* enable uploading */
-  curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE) ;
+  curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
 
   /* specify target */
   curl_easy_setopt(curl,CURLOPT_URL, URL);
 
   /* go verbose */
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   /* use active FTP */
   curl_easy_setopt(curl, CURLOPT_FTPPORT, "-");
diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c
index ba3fff7bd..8951a7444 100644
--- a/tests/libtest/lib526.c
+++ b/tests/libtest/lib526.c
@@ -74,7 +74,7 @@ int test(char *URL)
     curl_easy_setopt(curl[i], CURLOPT_URL, URL);
 
     /* go verbose */
-    curl_easy_setopt(curl[i], CURLOPT_VERBOSE, 1);
+    curl_easy_setopt(curl[i], CURLOPT_VERBOSE, 1L);
   }
 
   if ((m = curl_multi_init()) == NULL) {
@@ -142,7 +142,7 @@ int test(char *URL)
              the handle first too */
           curl_easy_reset(curl[0]);
           curl_easy_setopt(curl[0], CURLOPT_URL, URL);
-          curl_easy_setopt(curl[0], CURLOPT_VERBOSE, 1);
+          curl_easy_setopt(curl[0], CURLOPT_VERBOSE, 1L);
 
           /* re-add it */
           res = (int)curl_multi_add_handle(m, curl[0]);
diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index 98eeb5273..af7d00d02 100644
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@@ -71,10 +71,10 @@ int test(char *URL)
     curl_easy_setopt(curl[i], CURLOPT_URL, target_url);
 
     /* go verbose */
-    curl_easy_setopt(curl[i], CURLOPT_VERBOSE, 1);
+    curl_easy_setopt(curl[i], CURLOPT_VERBOSE, 1L);
 
     /* include headers */
-    curl_easy_setopt(curl[i], CURLOPT_HEADER, 1);
+    curl_easy_setopt(curl[i], CURLOPT_HEADER, 1L);
 
     /* add handle to multi */
     if ((res = (int)curl_multi_add_handle(m, curl[i])) != CURLM_OK) {
@@ -91,7 +91,7 @@ int test(char *URL)
     }
   }
 
-  curl_multi_setopt(m, CURLMOPT_PIPELINING, 1);
+  curl_multi_setopt(m, CURLMOPT_PIPELINING, 1L);
 
   ml_timedout = FALSE;
   ml_start = tutil_tvnow();
diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c
index 29e599fcd..9e764a97a 100644
--- a/tests/libtest/lib536.c
+++ b/tests/libtest/lib536.c
@@ -90,10 +90,10 @@ int test(char *URL)
     return TEST_ERR_MAJOR_BAD;
   }
 
-  curl_multi_setopt(multi, CURLMOPT_PIPELINING, 1);
+  curl_multi_setopt(multi, CURLMOPT_PIPELINING, 1L);
 
   curl_easy_setopt(easy, CURLOPT_WRITEFUNCTION, fwrite);
-  curl_easy_setopt(easy, CURLOPT_FAILONERROR, 1);
+  curl_easy_setopt(easy, CURLOPT_FAILONERROR, 1L);
   curl_easy_setopt(easy, CURLOPT_URL, URL);
 
   if (curl_multi_add_handle(multi, easy) != CURLM_OK) {
@@ -107,7 +107,7 @@ int test(char *URL)
   }
   curl_easy_reset(easy);
 
-  curl_easy_setopt(easy, CURLOPT_FAILONERROR, 1);
+  curl_easy_setopt(easy, CURLOPT_FAILONERROR, 1L);
   curl_easy_setopt(easy, CURLOPT_URL, libtest_arg2);
 
   if (curl_multi_add_handle(multi, easy) != CURLM_OK) {
diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c
index 1f5a34221..f3b42e755 100644
--- a/tests/libtest/lib537.c
+++ b/tests/libtest/lib537.c
@@ -486,7 +486,7 @@ int test(char *URL)
   }
 
   curl_easy_setopt(curl, CURLOPT_URL, URL);
-  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
 
   res = curl_easy_perform(curl);
 
diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c
index 4560eb815..089fcd5cb 100644
--- a/tests/libtest/lib540.c
+++ b/tests/libtest/lib540.c
@@ -30,9 +30,9 @@ static void init(CURLM *cm, const char* url, const char* userpwd,
   curl_easy_setopt(eh, CURLOPT_URL, url);
   curl_easy_setopt(eh, CURLOPT_PROXY, PROXY);
   curl_easy_setopt(eh, CURLOPT_PROXYUSERPWD, userpwd);
-  curl_easy_setopt(eh, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
-  curl_easy_setopt(eh, CURLOPT_VERBOSE, 1);
-  curl_easy_setopt(eh, CURLOPT_HEADER, 1);
+  curl_easy_setopt(eh, CURLOPT_PROXYAUTH, (long)CURLAUTH_ANY);
+  curl_easy_setopt(eh, CURLOPT_VERBOSE, 1L);
+  curl_easy_setopt(eh, CURLOPT_HEADER, 1L);
   curl_easy_setopt(eh, CURLOPT_HTTPHEADER, headers); /* custom Host: */
 
   curl_multi_add_handle(cm, eh);
diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c
index 71d2e38ed..a2224ae69 100644
--- a/tests/libtest/lib541.c
+++ b/tests/libtest/lib541.c
@@ -89,10 +89,10 @@ int test(char *URL)
   }
 
   /* enable uploading */
-  curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE) ;
+  curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
 
   /* enable verbose */
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE) ;
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   /* specify target */
   curl_easy_setopt(curl,CURLOPT_URL, URL);
diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c
index deb229d19..ffd8f361c 100644
--- a/tests/libtest/lib542.c
+++ b/tests/libtest/lib542.c
@@ -50,13 +50,13 @@ int test(char *URL)
   }
 
   /* enable verbose */
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE) ;
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   /* enable NOBODY */
-  curl_easy_setopt(curl, CURLOPT_NOBODY, TRUE) ;
+  curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
 
   /* disable HEADER */
-  curl_easy_setopt(curl, CURLOPT_HEADER, FALSE) ;
+  curl_easy_setopt(curl, CURLOPT_HEADER, 0L);
 
   /* specify target */
   curl_easy_setopt(curl,CURLOPT_URL, URL);
diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c
index bde630d6b..f91cef354 100644
--- a/tests/libtest/lib544.c
+++ b/tests/libtest/lib544.c
@@ -35,13 +35,13 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_URL, URL);
 
 #ifdef LIB545
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, sizeof teststring - 1);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long) sizeof teststring - 1);
 #endif
 
   curl_easy_setopt(curl, CURLOPT_COPYPOSTFIELDS, teststring);
 
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); /* show verbose for debug */
-  curl_easy_setopt(curl, CURLOPT_HEADER, 1); /* include header */
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); /* show verbose for debug */
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L); /* include header */
 
   /* Update the original data to detect non-copy. */
   strcpy(teststring, "FAIL");
diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c
index 52f1e2039..85f22fe8e 100644
--- a/tests/libtest/lib547.c
+++ b/tests/libtest/lib547.c
@@ -76,8 +76,8 @@ int test(char *URL)
   }
 
   curl_easy_setopt(curl, CURLOPT_URL, URL);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
 #ifdef LIB548
   /* set the data to POST with a mere pointer to a zero-terminated string */
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, UPLOADTHIS);
@@ -88,13 +88,13 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_READFUNCTION, readcallback);
   curl_easy_setopt(curl, CURLOPT_READDATA, &counter);
   /* We CANNOT do the POST fine without setting the size (or choose chunked)! */
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, strlen(UPLOADTHIS));
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)strlen(UPLOADTHIS));
 #endif
-  curl_easy_setopt(curl, CURLOPT_POST, 1);
+  curl_easy_setopt(curl, CURLOPT_POST, 1L);
   curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg2);
   curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, libtest_arg3);
   curl_easy_setopt(curl, CURLOPT_PROXYAUTH,
-                   CURLAUTH_NTLM | CURLAUTH_DIGEST | CURLAUTH_BASIC );
+                   (long) (CURLAUTH_NTLM | CURLAUTH_DIGEST | CURLAUTH_BASIC) );
 
   res = curl_easy_perform(curl);
 
diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c
index 1ffef002b..d50835624 100644
--- a/tests/libtest/lib549.c
+++ b/tests/libtest/lib549.c
@@ -32,11 +32,11 @@ int test(char *URL)
 
   curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg2);
   curl_easy_setopt(curl, CURLOPT_URL, URL);
-  curl_easy_setopt(curl, CURLOPT_PROXY_TRANSFER_MODE, 1);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
+  curl_easy_setopt(curl, CURLOPT_PROXY_TRANSFER_MODE, 1L);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
   if(libtest_arg3)
     /* enable ascii/text mode */
-    curl_easy_setopt(curl, CURLOPT_TRANSFERTEXT, TRUE);
+    curl_easy_setopt(curl, CURLOPT_TRANSFERTEXT, 1L);
 
   res = curl_easy_perform(curl);
 
diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c
index 3cfeffe73..5a0eb1c68 100644
--- a/tests/libtest/lib552.c
+++ b/tests/libtest/lib552.c
@@ -158,17 +158,17 @@ int test(char *URL)
     curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, my_trace);
     curl_easy_setopt(curl, CURLOPT_DEBUGDATA, &config);
     /* the DEBUGFUNCTION has no effect until we enable VERBOSE */
-    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
     /* setup repeated data string */
     for (i=0; i < sizeof data; ++i)
         data[i] = fill[i % sizeof fill];
 
     /* Post */
-    curl_easy_setopt(curl, CURLOPT_POST, 1);
+    curl_easy_setopt(curl, CURLOPT_POST, 1L);
 
     /* Setup read callback */
-    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, sizeof data);
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long) sizeof data);
     curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
 
     /* Write callback */
@@ -182,7 +182,7 @@ int test(char *URL)
     curl_easy_setopt(curl, CURLOPT_URL, URL);
 
     /* Accept any auth. But for this bug configure proxy with DIGEST, basic might work too, not NTLM */
-    curl_easy_setopt(curl, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+    curl_easy_setopt(curl, CURLOPT_PROXYAUTH, (long)CURLAUTH_ANY);
 
     res = curl_easy_perform(curl);
     fprintf(stderr, "curl_easy_perform = %d\n", (int)res);
diff --git a/tests/libtest/lib553.c b/tests/libtest/lib553.c
index f9c118620..7af25e5bb 100644
--- a/tests/libtest/lib553.c
+++ b/tests/libtest/lib553.c
@@ -60,10 +60,10 @@ int test(char *URL)
 
   curl_easy_setopt(curl, CURLOPT_URL, URL);
   curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
-  curl_easy_setopt(curl, CURLOPT_POST, 1);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, POSTLEN);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-  curl_easy_setopt(curl, CURLOPT_HEADER, 1);
+  curl_easy_setopt(curl, CURLOPT_POST, 1L);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)POSTLEN);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
   curl_easy_setopt(curl, CURLOPT_READFUNCTION, myreadfunc);
   res = curl_easy_perform(curl);
   curl_easy_cleanup(curl);
diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c
index 01a5903ea..792bbbed2 100644
--- a/tests/libtest/lib554.c
+++ b/tests/libtest/lib554.c
@@ -96,7 +96,7 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_URL, URL);
 
   /* Now specify we want to POST data */
-  curl_easy_setopt(curl, CURLOPT_POST, TRUE);
+  curl_easy_setopt(curl, CURLOPT_POST, 1L);
 
   /* Set the expected POST size */
   curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)pooh.sizeleft);
@@ -111,10 +111,10 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
 
   /* get verbose debug output please */
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
 
   /* include headers in the output */
-  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
 
   /* Perform the request, res will get the return code */
   res = curl_easy_perform(curl);
diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c
index ed12c5a44..ad259e0e6 100644
--- a/tests/libtest/lib555.c
+++ b/tests/libtest/lib555.c
@@ -80,8 +80,8 @@ int test(char *URL)
   }
 
   curl_easy_setopt(curl, CURLOPT_URL, URL);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+  curl_easy_setopt(curl, CURLOPT_HEADER, 1L);
 
   /* read the POST data from a callback */
   curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctlcallback);
@@ -91,11 +91,11 @@ int test(char *URL)
   /* We CANNOT do the POST fine without setting the size (or choose chunked)! */
   curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, strlen(UPLOADTHIS));
 
-  curl_easy_setopt(curl, CURLOPT_POST, 1);
+  curl_easy_setopt(curl, CURLOPT_POST, 1L);
   curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg2);
   curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, libtest_arg3);
   curl_easy_setopt(curl, CURLOPT_PROXYAUTH,
-                   CURLAUTH_NTLM | CURLAUTH_DIGEST | CURLAUTH_BASIC );
+                   (long) (CURLAUTH_NTLM | CURLAUTH_DIGEST | CURLAUTH_BASIC) );
 
   if ((m = curl_multi_init()) == NULL) {
     fprintf(stderr, "curl_multi_init() failed\n");