diff options
author | Craig Tiller <craig.tiller@gmail.com> | 2015-01-13 07:31:33 -0800 |
---|---|---|
committer | Craig Tiller <craig.tiller@gmail.com> | 2015-01-13 07:31:33 -0800 |
commit | ad0dcdc212220ac97cdc8a02afaf2adec9b76799 (patch) | |
tree | 77513e64cb7fc8d82904ee03adaae8047658146c | |
parent | d8532af01c00ea46431e21c6000a5f7fe44110ca (diff) |
Compile fix for mac
-rw-r--r-- | src/core/support/log_posix.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/support/log_posix.c b/src/core/support/log_posix.c index 0420570a3e..83d1c1386a 100644 --- a/src/core/support/log_posix.c +++ b/src/core/support/log_posix.c @@ -31,21 +31,27 @@ * */ -#define _POSIX_SOURCE + +#ifndef _POSIX_C_SOURCE +#define _POSIX_C_SOURCE 200112L +#endif + #define _GNU_SOURCE #include <grpc/support/port_platform.h> #if defined(GPR_POSIX_LOG) +#include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/time.h> #include <stdio.h> #include <stdarg.h> #include <string.h> +#include <stdio.h> #include <time.h> #include <pthread.h> -static long gettid() { return pthread_self(); } +static long gettid() { return (long)(gpr_intptr)pthread_self(); } void gpr_log(const char *file, int line, gpr_log_severity severity, const char *format, ...) { @@ -55,7 +61,7 @@ void gpr_log(const char *file, int line, gpr_log_severity severity, int ret; va_list args; va_start(args, format); - ret = vsnprintf(buf, format, args); + ret = vsnprintf(buf, sizeof(buf), format, args); va_end(args); if (ret < 0) { message = NULL; @@ -64,7 +70,7 @@ void gpr_log(const char *file, int line, gpr_log_severity severity, } else { message = allocated = gpr_malloc(ret + 1); va_start(args, format); - vsnprintf(message, format, args); + vsnprintf(message, ret, format, args); va_end(args); } gpr_log_message(file, line, severity, message); |