moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

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

the plain old FILE typedef.
This commit is contained in:
Daniel Stenberg 2004-03-03 09:25:59 +00:00
parent 533519cc9c
commit e2f7030202
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/file.c
View File

@ -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__)

4
lib/urldata.h
View File

@ -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;