Eric Lavigne updates

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6151c20633660f43e095a3f83e35fa8fbd1d2906..817cecf49217c7599916d8e03cb51e19f2ab7c72 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -10,9 +10,6 @@ EXTRA_DIST = getdate.y \
 
 lib_LTLIBRARIES = libcurl.la
 
-# Some flags needed when trying to cause warnings ;-)
-# CFLAGS = -DMALLOCDEBUG -g # -Wall #-pedantic
-
 INCLUDES = -I$(top_srcdir)/include
 
 

diff --git a/lib/mprintf.c b/lib/mprintf.c
index 7259a9adecf5235b74b835b141d7ee49696a1c7c..427d5b9f1887f086fdb457c4a9bb556851f1ea76 100644 (file)
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -902,14 +902,14 @@ static int dprintf_formatf(
        }
        else {
          /* Write "(nil)" for a nil pointer.  */
-         static char nil[] = "(nil)";
+         static char strnil[] = "(nil)";
          register char *point;
          
-         width -= sizeof(nil) - 1;
+         width -= sizeof(strnil) - 1;
          if (p->flags & FLAGS_LEFT)
            while (width-- > 0)
              OUTCHAR(' ');
-         for (point = nil; *point != '\0'; ++point)
+         for (point = strnil; *point != '\0'; ++point)
            OUTCHAR(*point);
          if (! (p->flags & FLAGS_LEFT))
            while (width-- > 0)

diff --git a/lib/setup.h b/lib/setup.h
index 30e945c2fd303fa23020e78ab73b8d0e46c73c00..bb9fc73554013d66c15a2181e6d0f199ae9b34f1 100644 (file)
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -41,9 +41,14 @@
 
 #else
 #ifdef WIN32
-/* include the hand-modified win32 adjusted config.h! */
+/* hand-modified win32 config.h! */
 #include "../config-win32.h"
 #endif
+#ifdef macintosh
+/* hand-modified MacOS config.h! */
+#include "config-mac.h"
+#endif
+
 #endif
 
 #ifndef __cplusplus        /* (rabe) */

diff --git a/lib/strequal.c b/lib/strequal.c
index 988f774bd3947e45f68aae93b902ce2aac261e2a..6859e26bd19a537f976daf098d293ec5147134d8 100644 (file)
--- a/lib/strequal.c
+++ b/lib/strequal.c
@@ -24,6 +24,7 @@
 #include "setup.h"
 
 #include <string.h>
+#include <ctype.h>
 
 int curl_strequal(const char *first, const char *second)
 {

diff --git a/lib/urldata.h b/lib/urldata.h
index 6749113fe1f7070b9bd76fb11a17bc06958d6bdb..29de6503708022d6b9b4716aef63d01eee4f1bbf 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -246,7 +246,7 @@ struct connectdata {
 
   char *range; /* range, if used. See README for detailed specification on
                   this syntax. */
-  int resume_from; /* continue [ftp] transfer from here */
+  ssize_t resume_from; /* continue [ftp] transfer from here */
 
   char *proxyhost; /* name of the http proxy host */