Skip to content

Commit

Permalink
icu: fix circular include on visual studio with C
Browse files Browse the repository at this point in the history
  • Loading branch information
nacho committed Jan 15, 2025
1 parent bef332e commit c126936
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From b0a600d2a3f7de6fd817d5b310f1f17f565d81db Mon Sep 17 00:00:00 2001
From: Ignazio Pillai <ignazp@amazon.com>
Date: Wed, 18 Dec 2024 12:49:47 +0100
Subject: [PATCH] Fix circular include on MS Visual Studio

Including ucal.h from a C file on MS VisualStudio triggers a circular include, which triggers a build fail.
---
source/common/unicode/platform.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/common/unicode/platform.h b/source/common/unicode/platform.h
index b2fcb21ef1..81976eacd8 100644
--- a/source/common/unicode/platform.h
+++ b/source/common/unicode/platform.h
@@ -728,12 +728,12 @@
/*
* Notes:
* C++11 and C11 require support for UTF-16 literals
- * Doesn't work on Mac C11 (see workaround in ptypes.h)
- * or Cygwin less than 3.5.
+ * Doesn't work on Mac C11 (see workaround in ptypes.h),
+ * MS Visual Studio or Cygwin less than 3.5.
*/
# if defined(__cplusplus)
# define U_HAVE_CHAR16_T 1
-# elif U_PLATFORM_IS_DARWIN_BASED || (U_PLATFORM == U_PF_CYGWIN && CYGWIN_VERSION_DLL_MAJOR < 3005)
+# elif U_PLATFORM_IS_DARWIN_BASED || (U_PLATFORM == U_PF_CYGWIN && CYGWIN_VERSION_DLL_MAJOR < 3005) || defined(_MSC_VER)
# define U_HAVE_CHAR16_T 0
# else
// conformant C11
--
2.38.1.windows.1

1 change: 1 addition & 0 deletions gvsbuild/projects/icu.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def __init__(self):
version="76.1",
archive_url="https://github.com/unicode-org/icu/releases/download/release-{major}-{minor}/icu4c-{major}_{minor}-src.zip",
hash="14a1942185dda2c5a07bd74f20a220954a7d94149fb5ef3cc782b52d9817fb3f",
patches=["0001-Fix-circular-include-on-MS-Visual-Studio.patch"],
)

def build(self):
Expand Down

0 comments on commit c126936

Please sign in to comment.