Commit 5cbde976 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

mod_journald: work around possible use of "inline" keyword in systemd #include. 

This fails to compile before c99, override with APR_INLINE.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812339 13f79535-47bb-0310-9956-ffa450edef68
parent 7532eb30

modules/loggers/mod_journald.c

+12 −4
Original line number Diff line number Diff line
@@ -30,14 +30,22 @@ 
#include "mpm_common.h"

#include "mod_log_config.h"



#define SD_JOURNAL_SUPPRESS_LOCATION 1



#include "systemd/sd-journal.h"



#if APR_HAVE_UNISTD_H

#include <unistd.h>

#endif



/* XXX: keep this after any other #include.

 * Some systemd versions use the "inline" keyword which is not

 * c89/c90 compliant, so override it...

 */

#if defined(__STDC__) && (!defined(__STDC_VERSION__) \

                          || __STDC_VERSION__ < 199901L)

#undef inline

#define inline APR_INLINE

#endif

#define SD_JOURNAL_SUPPRESS_LOCATION 1

#include <systemd/sd-journal.h>



#define MAX_ENTRIES 15



static int journald_info_get_priority(int level)