mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
Eric Lavigne updates
This commit is contained in:
parent
13ac89af24
commit
dccc77a325
@ -10,9 +10,6 @@ EXTRA_DIST = getdate.y \
|
|||||||
|
|
||||||
lib_LTLIBRARIES = libcurl.la
|
lib_LTLIBRARIES = libcurl.la
|
||||||
|
|
||||||
# Some flags needed when trying to cause warnings ;-)
|
|
||||||
# CFLAGS = -DMALLOCDEBUG -g # -Wall #-pedantic
|
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)/include
|
INCLUDES = -I$(top_srcdir)/include
|
||||||
|
|
||||||
|
|
||||||
|
@ -902,14 +902,14 @@ static int dprintf_formatf(
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* Write "(nil)" for a nil pointer. */
|
/* Write "(nil)" for a nil pointer. */
|
||||||
static char nil[] = "(nil)";
|
static char strnil[] = "(nil)";
|
||||||
register char *point;
|
register char *point;
|
||||||
|
|
||||||
width -= sizeof(nil) - 1;
|
width -= sizeof(strnil) - 1;
|
||||||
if (p->flags & FLAGS_LEFT)
|
if (p->flags & FLAGS_LEFT)
|
||||||
while (width-- > 0)
|
while (width-- > 0)
|
||||||
OUTCHAR(' ');
|
OUTCHAR(' ');
|
||||||
for (point = nil; *point != '\0'; ++point)
|
for (point = strnil; *point != '\0'; ++point)
|
||||||
OUTCHAR(*point);
|
OUTCHAR(*point);
|
||||||
if (! (p->flags & FLAGS_LEFT))
|
if (! (p->flags & FLAGS_LEFT))
|
||||||
while (width-- > 0)
|
while (width-- > 0)
|
||||||
|
@ -41,9 +41,14 @@
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
/* include the hand-modified win32 adjusted config.h! */
|
/* hand-modified win32 config.h! */
|
||||||
#include "../config-win32.h"
|
#include "../config-win32.h"
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef macintosh
|
||||||
|
/* hand-modified MacOS config.h! */
|
||||||
|
#include "config-mac.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __cplusplus /* (rabe) */
|
#ifndef __cplusplus /* (rabe) */
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
#include "setup.h"
|
#include "setup.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
|
||||||
int curl_strequal(const char *first, const char *second)
|
int curl_strequal(const char *first, const char *second)
|
||||||
{
|
{
|
||||||
|
@ -246,7 +246,7 @@ struct connectdata {
|
|||||||
|
|
||||||
char *range; /* range, if used. See README for detailed specification on
|
char *range; /* range, if used. See README for detailed specification on
|
||||||
this syntax. */
|
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 */
|
char *proxyhost; /* name of the http proxy host */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user