Commit dccc77a3 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Eric Lavigne updates

parent 13ac89af

lib/Makefile.am

+0 −3
Original line number Diff line number Diff line
@@ -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

lib/mprintf.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

lib/setup.h

+6 −1
Original line number Diff line number Diff line
@@ -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) */

lib/strequal.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "setup.h"



#include <string.h>

#include <ctype.h>



int curl_strequal(const char *first, const char *second)

{

lib/urldata.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */