diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2003-03-15 21:00:47 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2003-03-15 21:00:47 +0000 |
| commit | c871efca4b7cbe234934f61f3b78d4923688fe6d (patch) | |
| tree | be905c0dc63b6aa510b97173f01725c41e1dd8fc | |
| parent | 12c72b419c8640952b9fc79080a2c776ed88603c (diff) | |
Gisle Vanem fixed a name collision with structure '"CONTEXT" in <winnt.h>
| -rw-r--r-- | lib/getdate.y | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/getdate.y b/lib/getdate.y index b2b090a10..1ade36512 100644 --- a/lib/getdate.y +++ b/lib/getdate.y @@ -171,7 +171,7 @@ typedef enum _MERIDIAN { } MERIDIAN; /* parse results and input string */ -typedef struct _CONTEXT { +typedef struct _CURL_CONTEXT { const char *yyInput; int yyDayOrdinal; int yyDayNumber; @@ -194,14 +194,14 @@ typedef struct _CONTEXT { int yyRelMonth; int yyRelSeconds; int yyRelYear; -} CONTEXT; +} CURL_CONTEXT; /* 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 YYLEX_PARAM cookie -#define context ((CONTEXT *) cookie) +#define context ((CURL_CONTEXT *) cookie) %} /* 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; time_t Start; - CONTEXT cookie; + CURL_CONTEXT cookie; #ifdef HAVE_LOCALTIME_R struct tm keeptime; #endif |