diff -u3 -Hb -r CVS-latest/lib/if2ip.c lib/if2ip.c
--- CVS-latest/lib/if2ip.c	Wed Mar 17 14:46:46 2004
+++ lib/if2ip.c	Mon Apr 26 13:10:55 2004
@@ -81,7 +81,7 @@

 #define SYS_ERROR -1

-char *Curl_if2ip(char *interface, char *buf, int buf_size)
+char *Curl_if2ip(const char *interface, char *buf, int buf_size)
 {
   int dummy;
   char *ip=NULL;
@@ -125,8 +125,11 @@

 /* -- end of if2ip() -- */
 #else
-char *Curl_if2ip(char *interface, char *buf, int buf_size)
+char *Curl_if2ip(const char *interface, char *buf, int buf_size)
 {
+    (void) interface;
+    (void) buf;
+    (void) buf_size;
     return NULL;
 }
 #endif
diff -u3 -Hb -r CVS-latest/lib/if2ip.h lib/if2ip.h
--- CVS-latest/lib/if2ip.h	Fri Jan 16 09:15:05 2004
+++ lib/if2ip.h	Mon Apr 26 13:10:33 2004
@@ -26,7 +26,7 @@

 #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN32__) && \
     !defined(__riscos__) && !defined(__INTERIX)
-extern char *Curl_if2ip(char *interface, char *buf, int buf_size);
+extern char *Curl_if2ip(const char *interface, char *buf, int buf_size);
 #else
 #define Curl_if2ip(a,b,c) NULL
 #endif
diff -u3 -Hb -r CVS-latest/lib/libcurl.def lib/libcurl.def
--- CVS-latest/lib/libcurl.def	Thu Sep 04 12:04:15 2003
+++ lib/libcurl.def	Tue May 04 21:00:18 2004
@@ -14,7 +14,6 @@
 	curl_easy_setopt @ 5 ;
 	curl_escape @ 6 ;
 	curl_unescape @ 7;
-	curl_formparse @ 8 ;
 	curl_formfree @ 9 ;
 	curl_getdate @ 10 ;
 	curl_getenv @ 11 ;
diff -u3 -Hb -r CVS-latest/lib/memdebug.c lib/memdebug.c
--- CVS-latest/lib/memdebug.c	Wed May 05 08:57:04 2004
+++ lib/memdebug.c	Wed May 05 14:08:24 2004
@@ -129,8 +129,8 @@

   if(logfile && source)
     fprintf(logfile, "MEM %s:%d malloc(%zd) = %p\n",
-            source, line, wantedsize, mem->mem);
-  return mem->mem;
+            source, line, wantedsize, mem ? mem->mem : 0);
+  return (mem ? mem->mem : NULL);
 }

 void *curl_docalloc(size_t wanted_elements, size_t wanted_size,
@@ -155,8 +155,8 @@

   if(logfile && source)
     fprintf(logfile, "MEM %s:%d calloc(%u,%u) = %p\n",
-            source, line, wanted_elements, wanted_size, mem->mem);
-  return mem->mem;
+            source, line, wanted_elements, wanted_size, mem ? mem->mem : 0);
+  return (mem ? mem->mem : NULL);
 }

 char *curl_dostrdup(const char *str, int line, const char *source)
@@ -172,6 +172,7 @@
   len=strlen(str)+1;

   mem=curl_domalloc(len, 0, NULL); /* NULL prevents logging */
+  if (mem)
   memcpy(mem, str, len);

   if(logfile)
diff -u3 -Hb -r CVS-latest/lib/progress.c lib/progress.c
--- CVS-latest/lib/progress.c	Wed May 05 10:43:23 2004
+++ lib/progress.c	Wed May 05 13:58:01 2004
@@ -362,14 +362,14 @@
   if((data->progress.flags & PGRS_UL_SIZE_KNOWN) &&
      (data->progress.ulspeed > 0)) {
     ulestimate = (long)(data->progress.size_ul / data->progress.ulspeed);
-    ulpercen = (long)(data->progress.uploaded / data->progress.size_ul)*100;
+    ulpercen = (long)(100*data->progress.uploaded / data->progress.size_ul);
   }

   /* ... and the download */
   if((data->progress.flags & PGRS_DL_SIZE_KNOWN) &&
      (data->progress.dlspeed > 0)) {
     dlestimate = (long)(data->progress.size_dl / data->progress.dlspeed);
-    dlpercen = (long)(data->progress.downloaded / data->progress.size_dl)*100;
+    dlpercen = (long)(100*data->progress.downloaded / data->progress.size_dl);
   }

   /* Now figure out which of them that is slower and use for the for
@@ -393,7 +393,7 @@

   /* Get the percentage of data transfered so far */
   if(total_expected_transfer > 0)
-    total_percen=(int)(total_transfer/total_expected_transfer)*100;
+    total_percen=(int)(100*total_transfer/total_expected_transfer);

   fprintf(data->set.err,
           "\r%3d %s  %3d %s  %3d %s  %s  %s %s %s %s %s",