Modified the template of public_headers_must_be_c89.c

9 years ago · 886b344144
parent 12dfdc3c27
commit 886b344144
2 changed files with 3 additions and 3 deletions
--- a/include/grpc/impl/codegen/port_platform.h
+++ b/include/grpc/impl/codegen/port_platform.h
@ -345,7 +345,7 @@ typedef unsigned __int64 uint64_t;

 /* Validate platform combinations */
 #if defined(GPR_GCC_ATOMIC) + defined(GPR_GCC_SYNC) + \
-        defined(GPR_WINDOWS_ATOMIC) !=                  \
+        defined(GPR_WINDOWS_ATOMIC) !=                \
    1
 #error Must define exactly one of GPR_GCC_ATOMIC, GPR_GCC_SYNC, GPR_WINDOWS_ATOMIC
 #endif
@ -355,7 +355,7 @@ typedef unsigned __int64 uint64_t;
 #endif

 #if defined(GPR_CPU_LINUX) + defined(GPR_CPU_POSIX) + defined(GPR_WINDOWS) + \
-        defined(GPR_CPU_IPHONE) + defined(GPR_CPU_CUSTOM) !=               \
+        defined(GPR_CPU_IPHONE) + defined(GPR_CPU_CUSTOM) !=                 \
    1
 #error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WINDOWS, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
 #endif
--- a/templates/test/core/surface/public_headers_must_be_c89.c.template
+++ b/templates/test/core/surface/public_headers_must_be_c89.c.template
@ -35,7 +35,7 @@

  <%
  def is_platform_header(hdr):
-    for platform_identifier in ['_gcc', '_win32', '_pthread',
+    for platform_identifier in ['_gcc', '_windows', '_pthread',
                                '_zookeeper', '_msvc', '_posix']:
      if platform_identifier in hdr:
        return True