Investigate windows build failure.

marcalff · Jul 19, 2022 · a1cf1ff · a1cf1ff
1 parent 3831cd3
commit a1cf1ff
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/examples/grpc/client.cc b/examples/grpc/client.cc
@@ -13,9 +13,13 @@
 #include <string>
 #include "tracer_common.h"
 
-#ifdef DELETE
+#ifdef _WIN32
+#  ifdef DELETE
+// winnt.h defines DELETE
 // Causes a build error with FaasDocumentOperationValues::DELETE
-#  undef DELETE
+#    pragma message(__FILE__ ": removing define on DELETE")
+#    undef DELETE
+#  endif
 #endif
 
 #include "opentelemetry/trace/semantic_conventions.h"

diff --git a/examples/grpc/server.cc b/examples/grpc/server.cc
@@ -20,9 +20,13 @@
 #include <string>
 #include <thread>
 
-#ifdef DELETE
+#ifdef _WIN32
+#  ifdef DELETE
+// winnt.h defines DELETE
 // Causes a build error with FaasDocumentOperationValues::DELETE
-#  undef DELETE
+#    pragma message(__FILE__ ": removing define on DELETE")
+#    undef DELETE
+#  endif
 #endif
 
 #include "opentelemetry/trace/semantic_conventions.h"

diff --git a/examples/http/client.cc b/examples/http/client.cc
@@ -5,9 +5,13 @@
 #include "opentelemetry/ext/http/common/url_parser.h"
 #include "tracer_common.h"
 
-#ifdef DELETE
+#ifdef _WIN32
+#  ifdef DELETE
+// winnt.h defines DELETE
 // Causes a build error with FaasDocumentOperationValues::DELETE
-#  undef DELETE
+#    pragma message(__FILE__ ": removing define on DELETE")
+#    undef DELETE
+#  endif
 #endif
 
 #include "opentelemetry/trace/semantic_conventions.h"

diff --git a/examples/http/server.cc b/examples/http/server.cc
@@ -9,9 +9,13 @@
 #include <iostream>
 #include <thread>
 
-#ifdef DELETE
+#ifdef _WIN32
+#  ifdef DELETE
+// winnt.h defines DELETE
 // Causes a build error with FaasDocumentOperationValues::DELETE
-#  undef DELETE
+#    pragma message(__FILE__ ": removing define on DELETE")
+#    undef DELETE
+#  endif
 #endif
 
 #include "opentelemetry/trace/semantic_conventions.h"