[checkmk-commits] Fixed includes for inttypes, older headers are a bit picky about the format macros.

Module: check_mk Branch: master Commit: d6b4017ec0d766cd75806f4515744a72c647039c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6b4017ec0d766… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Tue Nov 10 09:26:19 2015 +0100 Fixed includes for inttypes, older headers are a bit picky about the format macros. --- livestatus/src/AndingFilter.cc | 2 +- livestatus/src/Logfile.cc | 2 +- livestatus/src/Makefile.am | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index 568dc16..d1f3879 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -23,7 +23,7 @@ // Boston, MA 02110-1301 USA. #include "AndingFilter.h" -#include <inttypes.h> +#include <cinttypes> #include "OringFilter.h" #include "Query.h" #include "logger.h" diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index dd3d934..b6ea0b2 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -25,11 +25,11 @@ #include "Logfile.h" #include <errno.h> #include <fcntl.h> -#include <inttypes.h> #include <stdlib.h> #include <string.h> #include <syslog.h> #include <unistd.h> +#include <cinttypes> #include <utility> #include "LogCache.h" #include "LogEntry.h" diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index a6a1ad7..69a7385 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -50,8 +50,8 @@ livestatus_so_SOURCES = \ global_counters.c module.c logger.c waittriggers.c TimeperiodsCache.cc pnp4nagios.cc mk_inventory.cc \ ContactgroupsColumn.cc CustomTimeperiodColumn.cc HostServiceState.cc opids.cc auth.cc -livestatus_so_CXXFLAGS = -fPIC -livestatus_so_CFLAGS = $(livestatus_so_CXXFLAGS) +livestatus_so_CXXFLAGS = -std=gnu++0x -fPIC +livestatus_so_CFLAGS = -fPIC livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES) -rm -f plugin.so