diff options
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | wsutil/time_util.c | 3 | ||||
| -rw-r--r-- | wsutil/ws_printf.h | 5 |
3 files changed, 2 insertions, 8 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 488905c0bf..36078f30cb 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -317,7 +317,7 @@ CHECKAPI( NAME wsutil SWITCHES - -g termoutput -build + --group termoutput:1 --summary-group termoutput --build SOURCES ${WSUTIL_COMMON_FILES} ) diff --git a/wsutil/time_util.c b/wsutil/time_util.c index 36ab7ef8ab..e26a1e5948 100644 --- a/wsutil/time_util.c +++ b/wsutil/time_util.c @@ -20,7 +20,6 @@ #else #include <windows.h> #endif -#include "ws_printf.h" /* ws_g_warning */ /* converts a broken down date representation, relative to UTC, * to a timestamp; it uses timegm() if it's available. @@ -108,7 +107,7 @@ void log_resource_usage(gboolean reset_delta, const char *format, ...) { g_string_append_vprintf(log_str, format, ap); va_end(ap); - ws_g_warning("%s", log_str->str); + g_warning("%s", log_str->str); g_string_free(log_str, TRUE); } diff --git a/wsutil/ws_printf.h b/wsutil/ws_printf.h index 2f12a03083..0a9b9d509e 100644 --- a/wsutil/ws_printf.h +++ b/wsutil/ws_printf.h @@ -71,11 +71,6 @@ debugging context has a protocol tree. */ #define ws_debug_printf printf -/* This is intended to fool checkAPIs.pl for few places that have legitimate -use for g_warning. This should be used sparingly. -*/ -#define ws_g_warning g_warning - #ifdef __cplusplus } #endif /* __cplusplus */ |