diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-07-15 14:07:18 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-07-15 14:07:18 -0700 |
| commit | e0d581b6ad1023635598d9de95bd951cd04b0354 (patch) | |
| tree | a0601b1315a1dc7b499998a95adba61322825f3c /src/core/support/log_posix.c | |
| parent | 658b6087cc07f8706d270ee0e31f28bbf732ec3d (diff) | |
| parent | 3e5d61670e23b040ed47b2df1e4c87ee2cfec4aa (diff) | |
Merge branch 'master' of github.com:grpc/grpc into decompression
# Conflicts:
# Makefile
# include/grpc++/client_context.h
# include/grpc++/server_context.h
# src/cpp/client/client_context.cc
# src/cpp/server/server_context.cc
# vsprojects/Grpc.mak
Diffstat (limited to 'src/core/support/log_posix.c')
| -rw-r--r-- | src/core/support/log_posix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/support/log_posix.c b/src/core/support/log_posix.c index afca792c40..940ee20f15 100644 --- a/src/core/support/log_posix.c +++ b/src/core/support/log_posix.c @@ -75,7 +75,7 @@ void gpr_default_log(gpr_log_func_args *args) { char *final_slash; const char *display_file; char time_buffer[64]; - gpr_timespec now = gpr_now(); + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); struct tm tm; final_slash = strrchr(args->file, '/'); |