Restoring sanity.

pull/3497/head
Nicolas "Pixel" Noble 9 years ago
parent 0f9a118f4e
commit 499fb052a0
  1. 6
      include/grpc/support/port_platform.h
  2. 8
      src/core/support/block_annotate.h

@ -47,10 +47,12 @@
#endif /* NOMINMAX */ #endif /* NOMINMAX */
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#error "Please compile grpc with _WIN32_WINNT of at least 0x600 (aka Windows Vista)" #error \
"Please compile grpc with _WIN32_WINNT of at least 0x600 (aka Windows Vista)"
#else /* !defined(_WIN32_WINNT) */ #else /* !defined(_WIN32_WINNT) */
#if (_WIN32_WINNT < 0x0600) #if (_WIN32_WINNT < 0x0600)
#error "Please compile grpc with _WIN32_WINNT of at least 0x600 (aka Windows Vista)" #error \
"Please compile grpc with _WIN32_WINNT of at least 0x600 (aka Windows Vista)"
#endif /* _WIN32_WINNT < 0x0600 */ #endif /* _WIN32_WINNT < 0x0600 */
#endif /* defined(_WIN32_WINNT) */ #endif /* defined(_WIN32_WINNT) */

@ -38,7 +38,11 @@
the code may block for reasons other than synchronization functions. the code may block for reasons other than synchronization functions.
These include poll, epoll, and getaddrinfo. */ These include poll, epoll, and getaddrinfo. */
#define GRPC_SCHEDULING_START_BLOCKING_REGION do {} while (0) #define GRPC_SCHEDULING_START_BLOCKING_REGION \
#define GRPC_SCHEDULING_END_BLOCKING_REGION do {} while (0) do { \
} while (0)
#define GRPC_SCHEDULING_END_BLOCKING_REGION \
do { \
} while (0)
#endif /* GRPC_INTERNAL_CORE_SUPPORT_BLOCK_ANNOTATE_H */ #endif /* GRPC_INTERNAL_CORE_SUPPORT_BLOCK_ANNOTATE_H */

Loading…
Cancel
Save