diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2001-11-27 07:27:32 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2001-11-27 07:27:32 +0000 |
| commit | dccc77a32595f39c01198ccdd9e2c7794588c556 (patch) | |
| tree | 6acc527ac1eba4da7eedb1b856c3e144e8e3a487 /lib | |
| parent | 13ac89af24f8d478147d091d652a8599399311b8 (diff) | |
Eric Lavigne updates
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/mprintf.c | 6 | ||||
| -rw-r--r-- | lib/setup.h | 7 | ||||
| -rw-r--r-- | lib/strequal.c | 1 | ||||
| -rw-r--r-- | lib/urldata.h | 2 |
5 files changed, 11 insertions, 8 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 6151c2063..817cecf49 100644 --- 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 7259a9ade..427d5b9f1 100644 --- 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 30e945c2f..bb9fc7355 100644 --- 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 988f774bd..6859e26bd 100644 --- 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 6749113fe..29de65037 100644 --- 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 */ |