diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-24 12:21:03 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-24 12:21:03 +0200 |
commit | 394f8dd88908314796e0a2ca679188a8f511f18d (patch) | |
tree | 34da271816ceffb8f9dd1e6dc33e51d599a9d0b5 /runtime/typedefs.h | |
parent | 6ec2a6f4232c8bd6ff2769b1b1d324d4f9e78c80 (diff) | |
parent | aa2408f825cd46091af0a8976dc2c14b1b797206 (diff) | |
download | rsyslog-394f8dd88908314796e0a2ca679188a8f511f18d.tar.gz rsyslog-394f8dd88908314796e0a2ca679188a8f511f18d.tar.bz2 rsyslog-394f8dd88908314796e0a2ca679188a8f511f18d.zip |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/typedefs.h')
-rw-r--r-- | runtime/typedefs.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/typedefs.h b/runtime/typedefs.h index 5cc24e4a..ca63d0d5 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -3,7 +3,7 @@ * * Begun 2010-11-25 RGerhards * - * Copyright (C) 2005-2008 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2005-2013 by Rainer Gerhards and Adiscon GmbH * * This file is part of the rsyslog runtime library. * @@ -148,6 +148,10 @@ typedef enum { FIOP_ISEMPTY = 6 /* string empty <=> strlen(s) == 0 ?*/ } fiop_t; +#if defined(__FreeBSD__) + typedef off_t off64_t; +#endif + /* types of configuration handlers */ typedef enum cslCmdHdlrType { |