diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-28 09:35:27 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-28 09:35:27 +0100 |
| commit | 9bcab61d2780e719b5551322ddc7d08c6cf7725f (patch) | |
| tree | dc4bb9a3dfcd244fba77dd5a3726b80c9a4c5909 /include | |
| parent | 545c6c133de700785876959efbeb7a2987dcf2c7 (diff) | |
| parent | bd76a63a6f3683930a83a4770d06bb29e4e8820a (diff) | |
Merge branch 'win32-cleanup' into make-ruby-installable
Diffstat (limited to 'include')
| -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 { |