diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2016-01-28 15:45:08 -0800 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2016-01-28 15:45:08 -0800 |
| commit | 54cc08c216ea23a85e122ef19a30ffe3399255e9 (patch) | |
| tree | a923c2e552c2827bd7491b19ff63443e7c2fdcef /include/grpc | |
| parent | a50da4757ae7eb75b67d78b7e82fba79d2c987da (diff) | |
| parent | 822602cff0f3b1f8373ac06a8ab8fe9792b1037e (diff) | |
Merge branch 'master' of github.com:grpc/grpc into ssl_credentials_override_default_roots
Diffstat (limited to 'include/grpc')
| -rw-r--r-- | include/grpc/support/log_win32.h | 4 | ||||
| -rw-r--r-- | include/grpc/support/thd.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/grpc/support/log_win32.h b/include/grpc/support/log_win32.h index ea6b16dd77..3546266976 100644 --- a/include/grpc/support/log_win32.h +++ b/include/grpc/support/log_win32.h @@ -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 @@ -42,7 +42,7 @@ extern "C" { * formatted error message, corresponding to the error messageid. * Use in conjunction with GetLastError() et al. */ -char *gpr_format_message(DWORD messageid); +char *gpr_format_message(int messageid); #ifdef __cplusplus } diff --git a/include/grpc/support/thd.h b/include/grpc/support/thd.h index 58b8a8340e..56185cc8ea 100644 --- a/include/grpc/support/thd.h +++ b/include/grpc/support/thd.h @@ -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 @@ -48,7 +48,7 @@ extern "C" { #endif -typedef uint64_t gpr_thd_id; +typedef uintptr_t gpr_thd_id; /* Thread creation options. */ typedef struct { |