generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Gisle Vanem fixed a name collision with structure '"CONTEXT" in <winnt.h>

Browse Source
This commit is contained in:
Daniel Stenberg
2003-03-15 21:00:47 +00:00
parent 12c72b419c
commit c871efca4b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/getdate.y
View File

@@ -171,7 +171,7 @@ typedef enum _MERIDIAN {
} MERIDIAN; } MERIDIAN;
/* parse results and input string */ /* parse results and input string */
typedef struct _CONTEXT { typedef struct _CURL_CONTEXT {
const char *yyInput; const char *yyInput;
int yyDayOrdinal; int yyDayOrdinal;
int yyDayNumber; int yyDayNumber;
@@ -194,14 +194,14 @@ typedef struct _CONTEXT {
int yyRelMonth; int yyRelMonth;
int yyRelSeconds; int yyRelSeconds;
int yyRelYear; int yyRelYear;
} CONTEXT; } CURL_CONTEXT;
/* enable use of extra argument to yyparse and yylex which can be used to pass /* enable use of extra argument to yyparse and yylex which can be used to pass
** in a user defined value (CONTEXT struct in our case) ** in a user defined value (CURL_CONTEXT struct in our case)
*/ */
#define YYPARSE_PARAM cookie #define YYPARSE_PARAM cookie
#define YYLEX_PARAM cookie #define YYLEX_PARAM cookie
#define context ((CONTEXT *) cookie) #define context ((CURL_CONTEXT *) cookie)
%} %}
/* This grammar has 13 shift/reduce conflicts. */ /* This grammar has 13 shift/reduce conflicts. */
@@ -944,7 +944,7 @@ curl_getdate (const char *p, const time_t *now)
{ {
struct tm tm, tm0, *tmp; struct tm tm, tm0, *tmp;
time_t Start; time_t Start;
CONTEXT cookie; CURL_CONTEXT cookie;
#ifdef HAVE_LOCALTIME_R #ifdef HAVE_LOCALTIME_R
struct tm keeptime; struct tm keeptime;
#endif #endif