Commit 8c62e337 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

bool typedef fix

parent 51bcdb47

include/curl/curl.h

+5 −7
Original line number Diff line number Diff line
@@ -412,10 +412,6 @@ typedef enum { 


#ifdef __BEOS__

#include <support/SupportDefs.h>

#else

#ifndef __cplusplus        /* (rabe) */

typedef char bool;

#endif                     /* (rabe) */

#endif
@@ -442,8 +438,8 @@ char *curl_getenv(char *variable); 
char *curl_version(void);



/* This is the version number */

#define LIBCURL_VERSION "7.3"

#define LIBCURL_VERSION_NUM 0x070300

#define LIBCURL_VERSION "7.4-pre5"

#define LIBCURL_VERSION_NUM 0x070400



/* linked-list structure for the CURLOPT_QUOTE option (and other) */

struct curl_slist {
@@ -661,8 +657,10 @@ typedef enum { 
  CURLINFO_SIZE_DOWNLOAD    = CURLINFO_DOUBLE + 8,

  CURLINFO_SPEED_DOWNLOAD   = CURLINFO_DOUBLE + 9,

  CURLINFO_SPEED_UPLOAD     = CURLINFO_DOUBLE + 10,

  CURLINFO_LASTONE          = 11,

  CURLINFO_HEADER_SIZE      = CURLINFO_LONG   + 11,

  CURLINFO_REQUEST_SIZE     = CURLINFO_LONG   + 12,



  CURLINFO_LASTONE          = 13,

} CURLINFO;



/*

src/main.c

+9 −1
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 
#include <curl/curl.h>

#include <curl/types.h> /* new for v7 */

#include <curl/easy.h> /* new for v7 */



#define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */

#include <curl/mprintf.h>



#include "urlglob.h"
@@ -86,6 +88,10 @@ 
#include "../lib/memdebug.h"

#endif



#ifndef __cplusplus        /* (rabe) */

typedef char bool;

#endif                     /* (rabe) */



typedef enum {

  HTTPREQ_UNSPEC,

  HTTPREQ_GET,
@@ -1530,7 +1536,6 @@ int main(int argc, char *argv[]) 
    curl_easy_setopt(curl, CURLOPT_TIMEVALUE, config.condtime);

    curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, config.customrequest);

    curl_easy_setopt(curl, CURLOPT_STDERR, config.errors);

    curl_easy_setopt(curl, CURLOPT_WRITEINFO, config.writeout);



    /* three new ones in libcurl 7.3: */

    curl_easy_setopt(curl, CURLOPT_HTTPPROXYTUNNEL, config.proxytunnel);
@@ -1593,6 +1598,9 @@ int main(int argc, char *argv[]) 
    printf("--%s--\n", MIMEseparator);

#endif



  /* cleanup memory used for URL globbing patterns */

  glob_cleanup(urls);



  curl_slist_free_all(config.quote); /* the checks for config.quote == NULL */

  curl_slist_free_all(config.postquote); /*  */

  curl_slist_free_all(config.headers); /*  */