diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-12-17 07:17:54 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-12-17 07:17:54 +1100 |
| commit | 1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3 (patch) | |
| tree | cee337a9c93890605fb12490faec2a7f0b2188d8 /source3/modules/getdate.y | |
| parent | e294c4799bf6ad8da043aadf8341391644147056 (diff) | |
| parent | 54dc421f5820099531a77879f52a904c2fefcf49 (diff) | |
| download | samba-1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3.tar.gz samba-1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3.tar.bz2 samba-1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/modules/getdate.y')
| -rw-r--r-- | source3/modules/getdate.y | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/source3/modules/getdate.y b/source3/modules/getdate.y index edfb9d5ad7..21c01b896b 100644 --- a/source3/modules/getdate.y +++ b/source3/modules/getdate.y @@ -157,9 +157,6 @@ typedef struct #define YYLEX_PARAM parm #define YYPARSE_PARAM parm -static int yyerror (); -static int yylex (); - %} /* We want a reentrant parser. */ @@ -174,6 +171,13 @@ static int yylex (); textint textintval; } +%{ + +static int yyerror(const char *); +static int yylex(YYSTYPE *, parser_control *); + +%} + %token tAGO tDST %token <intval> tDAY tDAY_UNIT tDAYZONE tHOUR_UNIT tLOCAL_ZONE tMERIDIAN @@ -449,13 +453,13 @@ o_merid: #include "modules/getdate.h" #ifndef gmtime -struct tm *gmtime (); +struct tm *gmtime (const time_t *); #endif #ifndef localtime -struct tm *localtime (); +struct tm *localtime (const time_t *); #endif #ifndef mktime -time_t mktime (); +time_t mktime (struct tm *); #endif static table const meridian_table[] = @@ -863,7 +867,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) /* Do nothing if the parser reports an error. */ static int -yyerror (char *s ATTRIBUTE_UNUSED) +yyerror (const char *s ATTRIBUTE_UNUSED) { return 0; } |