fix compiler warnings on macOS

This commit is contained in:
Philipp Moritz
2016-10-12 00:56:04 -07:00
parent 6290cab750
commit 50fb53fd91
2 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
CC = gcc
CFLAGS = -g -Wall --std=c99 -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=200809L -fPIC -I. -Ithirdparty -Ithirdparty/ae
CFLAGS = -g -Wall --std=c99 -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=200809L -fPIC -I. -Ithirdparty -Ithirdparty/ae -Wno-typedef-redefinition
BUILD = build
all: hiredis $(BUILD)/libcommon.a
+4 -2
View File
@@ -1,5 +1,7 @@
#include "logging.h"
#include <stdint.h>
#include <inttypes.h>
#include <hiredis/hiredis.h>
#include <utstring.h>
@@ -52,13 +54,13 @@ void ray_log(ray_logger *logger,
UT_string *timestamp;
utstring_new(timestamp);
gettimeofday(&tv, NULL);
utstring_printf(timestamp, "%ld.%ld", tv.tv_sec, tv.tv_usec);
utstring_printf(timestamp, "%ld.%ld", tv.tv_sec, (long) tv.tv_usec);
UT_string *origin_id;
utstring_new(origin_id);
if (logger->is_direct) {
db_handle *db = (db_handle *) logger->conn;
utstring_printf(origin_id, "%ld:%s", db->client_id, "");
utstring_printf(origin_id, "%" PRId64 ":%s", db->client_id, "");
redisAsyncCommand(db->context, NULL, NULL, log_fmt,
utstring_body(timestamp), logger->client_type,
utstring_body(origin_id), log_levels[log_level],