diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-16 15:36:53 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-16 15:36:53 +0100 |
commit | a7109b183b555ee795c3e32c63e2647025705fc1 (patch) | |
tree | bc118e6f1dd72466367a4aa9b31df08f253eaa07 /source3/modules/getdate.y | |
parent | 0f04beff337a936a66c86272ff79defd9e8ae173 (diff) | |
parent | 9e64ed018e5aa84d802b01953b481fbb07eb00aa (diff) | |
download | samba-a7109b183b555ee795c3e32c63e2647025705fc1.tar.gz samba-a7109b183b555ee795c3e32c63e2647025705fc1.tar.bz2 samba-a7109b183b555ee795c3e32c63e2647025705fc1.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; } |