| commit | d13b884d1a0eea630a545755baf78cd6317c0fa2 | [log] [tgz] |
|---|---|---|
| author | Jinsong Ji <jinsong.ji@fuchsia.infra.roller.intel.com> | Sun Dec 15 08:54:57 2024 -0800 |
| committer | Copybara-Service <copybara-worker@google.com> | Sun Dec 15 08:57:50 2024 -0800 |
| tree | 042bc59f95af72bee1a72bdd41572bb1ec15e6c4 | |
| parent | 30adaea610d24b2a2f8cccf14f5d58da89658fe1 [diff] |
[roll] Roll llvm-project/libc libc: Prefix RPC Status code to avoid conflict in windows build (#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.
GitOrigin-RevId: 90506b8a94b0e706bc275822f2dd037a65af71e0
Original-Revision: 5112652ef534dd33c0a27d3c381b0b9278978a78
Change-Id: I9a570853be6051bfc13246077c2dbae1fa788e87
This repository contains Fuchsia's Global Integration manifest files.
All changes should be made to the internal version of this repository. Our infrastructure automatically updates this version when the internal one changes.
Currently all changes must be made by a Google employee. Non-Google employees wishing to make a change can ask for assistance in one of the communication channels documented at get involved.
First install Jiri.
Next run:
$ jiri init $ jiri import minimal https://fuchsia.googlesource.com/integration $ jiri update
Third party projects should have their own subdirectory in ./third_party.