[tinyxml2] avoid redefinition of TINYXML2_LIB

microsoft · Oct 28, 2022 · 13f5750 · 13f5750
1 parent c50746e
commit 13f5750
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/ports/tinyxml2/0002-fix-check-for-TINYXML2_EXPORT-on-non-windows.patch b/ports/tinyxml2/0002-fix-check-for-TINYXML2_EXPORT-on-non-windows.patch
@@ -1,23 +1,22 @@
-From 632c311b18015d194151489bb0773a28eed9c2e1 Mon Sep 17 00:00:00 2001
+From 4beabf9fe05a049577e3923327804851d6a05f24 Mon Sep 17 00:00:00 2001
 From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
 Date: Thu, 27 Oct 2022 19:06:52 -0700
-Subject: [PATCH 2/2] fix: check for TINYXML2_EXPORT on non windows
+Subject: [PATCH] fix: check for TINYXML2_EXPORT on non windows
 
 ---
- tinyxml2.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ tinyxml2.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tinyxml2.h b/tinyxml2.h
-index cfb1053..a56251c 100755
+index cfb1053..5a36901 100755
 --- a/tinyxml2.h
 +++ b/tinyxml2.h
-@@ -72,7 +72,8 @@ distribution.
+@@ -72,7 +72,7 @@ distribution.
  #   else
  #       define TINYXML2_LIB
  #   endif
 -#elif __GNUC__ >= 4
-+#endif
-+#if defined(TINYXML2_EXPORT) && __GNUC__ >= 4
++#elif defined(TINYXML2_EXPORT) && __GNUC__ >= 4
  #   define TINYXML2_LIB __attribute__((visibility("default")))
  #else
  #   define TINYXML2_LIB

diff --git a/versions/t-/tinyxml2.json b/versions/t-/tinyxml2.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "fca8e408ee125d30e546ba42bd9caf4955ab7430",
+      "git-tree": "c88f30e7ca28b2de522a19a7c7b6d318664e3860",
       "version-semver": "9.0.0",
       "port-version": 2
     },