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

rename struct FILE to FILEPROTO, to prevent it from causing trouble with 

the plain old FILE typedef.
parent 533519cc

lib/file.c

+2 −3
Original line number Diff line number Diff line
@@ -95,18 +95,17 @@ 
CURLcode Curl_file_connect(struct connectdata *conn)

{

  char *real_path = curl_unescape(conn->path, 0);

  struct FILE *file;

  struct FILEPROTO *file;

  int fd;

#if defined(WIN32) || defined(__EMX__)

  int i;

  char *actual_path;

#endif



  file = (struct FILE *)malloc(sizeof(struct FILE));

  file = (struct FILEPROTO *)calloc(sizeof(struct FILEPROTO), 1);

  if(!file)

    return CURLE_OUT_OF_MEMORY;



  memset(file, 0, sizeof(struct FILE));

  conn->proto.file = file;



#if defined(WIN32) || defined(__EMX__)

lib/urldata.h

+2 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ struct FTP { 
/****************************************************************************

 * FILE unique setup

 ***************************************************************************/

struct FILE {

struct FILEPROTO {

  int fd; /* open file descriptor to read from! */

};
@@ -539,7 +539,7 @@ struct connectdata { 
    struct HTTP *gopher; /* alias, just for the sake of being more readable */

    struct HTTP *https;  /* alias, just for the sake of being more readable */

    struct FTP *ftp;

    struct FILE *file;

    struct FILEPROTO *file;

    void *telnet;        /* private for telnet.c-eyes only */

#if 0 /* no need for special ones for these: */

    struct LDAP *ldap;