From 88e2d16c070f480e1892044f329cd38df298003d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 3 Jun 2013 20:50:20 +0300 Subject: apply some OpenBSD fixes. --- src/logger.h | 4 ++++ src/mumblemanager.cpp | 3 +++ src/utils/stringutils.h | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/src/logger.h b/src/logger.h index 32499ee49..8b484e8f5 100644 --- a/src/logger.h +++ b/src/logger.h @@ -76,7 +76,11 @@ class Logger final */ void log(const char *const log_text, ...) #ifdef __GNUC__ +#ifdef __OpenBSD__ + __attribute__((__format__(printf, 2, 3))) +#else __attribute__((__format__(gnu_printf, 2, 3))) +#endif #endif ; diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp index a96fcfe3e..06387cdf5 100644 --- a/src/mumblemanager.cpp +++ b/src/mumblemanager.cpp @@ -16,6 +16,9 @@ #include "utils/mathutils.h" +#ifdef __OpenBSD__ +#include +#endif #include #include #include diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 0f9599f03..eae73ce40 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -99,8 +99,12 @@ std::string strprintf(const char *const format, ...) A_WARN_UNUSED #ifdef __GNUC__ /* This attribute is nice: it even works through gettext invokation. For example, gcc will complain that strprintf(_("%s"), 42) is ill-formed. */ +#ifdef __OpenBSD__ + __attribute__((__format__(printf, 1, 2))) +#else __attribute__((__format__(gnu_printf, 1, 2))) #endif +#endif ; /** -- cgit v1.2.3-60-g2f50