aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/support/log_posix.c
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-03-28 08:29:05 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-03-28 08:29:05 -0700
commit9d77ed5e2df5eabed41e0acac511d2f2edff3aad (patch)
tree51355e20b28e7515cc90922e2e3f3e0399992f9a /src/core/support/log_posix.c
parentef37d7cd4eee37689380e727a268fbb06f286fcb (diff)
parent94f908ae84ab6d280a41e09245925ecfa612dce8 (diff)
Merge github.com:grpc/grpc into accounting
Diffstat (limited to 'src/core/support/log_posix.c')
-rw-r--r--src/core/support/log_posix.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/support/log_posix.c b/src/core/support/log_posix.c
index 3ff171f99c..7429dd0a2c 100644
--- a/src/core/support/log_posix.c
+++ b/src/core/support/log_posix.c
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,12 +38,12 @@
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/time.h>
-#include <stdio.h>
+#include <pthread.h>
#include <stdarg.h>
-#include <string.h>
#include <stdio.h>
+#include <stdio.h>
+#include <string.h>
#include <time.h>
-#include <pthread.h>
static intptr_t gettid(void) { return (intptr_t)pthread_self(); }