[libc-commits] [libc] [llvm] libc: Rename ERROR to RPC_ERROR to avoid conflict in windows build (PR #119991)

[Jinsong Ji via libc-commits]

https://github.com/jsji created https://github.com/llvm/llvm-project/pull/119991

Somehow conflict with define in wingdi.h.

Fix build failures:

[ 52%] Building CXX object projects/offload/plugins-nextgen/common/CMakeFiles/PluginCommon.dir/src/RPC.cpp.obj
In file included from ...llvm\offload\plugins-nextgen\common\src\RPC.cpp:16:
...\llvm\libc\shared\rpc.h(48,3): error: expected identifier
   48 |   ERROR = 0x1000,
      |   ^
c:\Program files (x86)\Windows Kits\10\include\10.0.22000.0\um\wingdi.h(118,29): note: expanded from macro 'ERROR'
  118 | #define ERROR               0
      |                             ^
...\llvm\offload\plugins-nextgen\common\src\RPC.cpp(75,17): error: expected unqualified-id
   75 |     return rpc::ERROR;
      |                 ^
c:\Program files (x86)\Windows Kits\10\include\10.0.22000.0\um\wingdi.h(118,29): note: expanded from macro 'ERROR'
  118 | #define ERROR               0
      |                             ^
2 errors generated.


>From cb5f98a3c8cf060fada25347cef6bbd7c55c7280 Mon Sep 17 00:00:00 2001
From: Jinsong Ji <jinsong.ji at intel.com>
Date: Sat, 14 Dec 2024 11:17:33 -0800
Subject: [PATCH] libc: Rename ERROR to RPC_ERROR to avoid conflict in windows
 build

Somehow conflict with define in wingdi.h.

Fix build failures:

[ 52%] Building CXX object projects/offload/plugins-nextgen/common/CMakeFiles/PluginCommon.dir/src/RPC.cpp.obj
In file included from ...llvm\offload\plugins-nextgen\common\src\RPC.cpp:16:
...\llvm\libc\shared\rpc.h(48,3): error: expected identifier
   48 |   ERROR = 0x1000,
      |   ^
c:\Program files (x86)\Windows Kits\10\include\10.0.22000.0\um\wingdi.h(118,29): note: expanded from macro 'ERROR'
  118 | #define ERROR               0
      |                             ^
...\llvm\offload\plugins-nextgen\common\src\RPC.cpp(75,17): error: expected unqualified-id
   75 |     return rpc::ERROR;
      |                 ^
c:\Program files (x86)\Windows Kits\10\include\10.0.22000.0\um\wingdi.h(118,29): note: expanded from macro 'ERROR'
  118 | #define ERROR               0
      |                             ^
2 errors generated.
---
 libc/shared/rpc.h                          | 2 +-
 libc/utils/gpu/server/rpc_server.cpp       | 2 +-
 offload/plugins-nextgen/common/src/RPC.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libc/shared/rpc.h b/libc/shared/rpc.h
index 3f586744377d98..2d41b6940b64c2 100644
--- a/libc/shared/rpc.h
+++ b/libc/shared/rpc.h
@@ -45,7 +45,7 @@ namespace rpc {
 /// Generic codes that can be used whem implementing the server.
 enum Status {
   SUCCESS = 0x0,
-  ERROR = 0x1000,
+  RPC_ERROR = 0x1000,
   UNHANDLED_OPCODE = 0x1001,
 };
 
diff --git a/libc/utils/gpu/server/rpc_server.cpp b/libc/utils/gpu/server/rpc_server.cpp
index f724c5c82c4222..d2742a84ab68bd 100644
--- a/libc/utils/gpu/server/rpc_server.cpp
+++ b/libc/utils/gpu/server/rpc_server.cpp
@@ -455,7 +455,7 @@ rpc::Status handle_libc_opcodes(rpc::Server::Port &port, uint32_t num_lanes) {
   case 64:
     return handle_port_impl<64>(port);
   default:
-    return rpc::ERROR;
+    return rpc::RPC_ERROR;
   }
 }
 } // namespace rpc
diff --git a/offload/plugins-nextgen/common/src/RPC.cpp b/offload/plugins-nextgen/common/src/RPC.cpp
index 66f98e68dc4429..004f05c5042eee 100644
--- a/offload/plugins-nextgen/common/src/RPC.cpp
+++ b/offload/plugins-nextgen/common/src/RPC.cpp
@@ -72,7 +72,7 @@ static rpc::Status handle_offload_opcodes(plugin::GenericDeviceTy &Device,
   else if (NumLanes == 64)
     return handle_offload_opcodes<64>(Device, Port);
   else
-    return rpc::ERROR;
+    return rpc::RPC_ERROR;
 }
 
 RPCServerTy::RPCServerTy(plugin::GenericPluginTy &Plugin)