diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-10 17:47:11 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-10 17:47:11 +0200 |
| commit | ebcf2c01833223e901b797c502d82e1043073464 (patch) | |
| tree | 5d5d486860bbe9ee4e032d92fba00a366d931b98 | |
| parent | 1280d7d5d4e67fcd2de8cfb52cea94b4222e9553 (diff) | |
| parent | 93c5ec6305095306adff8aad5081cd5bb675cf72 (diff) | |
| download | rsyslog-ebcf2c01833223e901b797c502d82e1043073464.tar.gz rsyslog-ebcf2c01833223e901b797c502d82e1043073464.tar.bz2 rsyslog-ebcf2c01833223e901b797c502d82e1043073464.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | grammar/lexer.l | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -72,6 +72,8 @@ Version 7.4.3 [v7.4-stable] 2013-07-?? - bugfix: omlibdbi did not properly close connection on some errors This happened to errors occuring in Begin/End Transaction entry points. +- fix build on FreeBSD + Thanks to Christiano Rolim for the patch --------------------------------------------------------------------------- Version 7.4.2 [v7.4-stable] 2013-07-04 - bugfix: in RFC5425 TLS, multiple wildcards in auth could cause segfault diff --git a/grammar/lexer.l b/grammar/lexer.l index 237eb2a6..ed5d8a80 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -88,7 +88,9 @@ extern int yydebug; /* somehow, I need these prototype even though the headers are * included. I guess that's some autotools magic I don't understand... */ +#if !defined(__FreeBSD__) int fileno(FILE *stream); +#endif %} |