diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
| commit | c828f3634723996e6031fb2e3c3d1ac3f4de0cad (patch) | |
| tree | b3fe00a043d5b9351868a0d1f8aead41bb52d2be /ports/upb/fix-uwp.patch | |
| parent | 6635a2fa596ca457565eebc2a45664309cd24d77 (diff) | |
| parent | f3f329a048eaff759c1992c458f2e12351486bc7 (diff) | |
| download | vcpkg-update-geos-381.tar.gz vcpkg-update-geos-381.zip | |
Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381
Diffstat (limited to 'ports/upb/fix-uwp.patch')
| -rw-r--r-- | ports/upb/fix-uwp.patch | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/ports/upb/fix-uwp.patch b/ports/upb/fix-uwp.patch index 91c45b416..bbc8e257a 100644 --- a/ports/upb/fix-uwp.patch +++ b/ports/upb/fix-uwp.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 577000a..759e35b 100644 +index eda6a72..386966f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,10 @@ elseif(UNIX) @@ -11,5 +11,18 @@ index 577000a..759e35b 100644 +endif() + enable_testing() - add_library(descriptor_upbproto INTERFACE) - add_library(upb + + add_library(port +diff --git a/upb/json_decode.c b/upb/json_decode.c +index 953d238..5185ffd 100644 +--- a/upb/json_decode.c ++++ b/upb/json_decode.c +@@ -1138,7 +1138,7 @@ static void jsondec_struct(jsondec *d, upb_msg *msg, const upb_msgdef *m) { + static void jsondec_wellknownvalue(jsondec *d, upb_msg *msg, + const upb_msgdef *m) { + upb_msgval val; +- const upb_fielddef *f; ++ const upb_fielddef *f = NULL; + upb_msg *submsg; + + switch (jsondec_peek(d)) { |