fix msvc build

conan-io · Jan 11, 2023 · 7025a8f · 7025a8f
1 parent 320c55b
commit 7025a8f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/recipes/libucl/all/conandata.yml b/recipes/libucl/all/conandata.yml
@@ -19,6 +19,9 @@ patches:
     - patch_file: "patches/0004-0.8.2-cmake-minimum-required.patch"
       patch_description: "declare cmake_minimum_required first"
       patch_type: "portability"
+    - patch_file: "patches/0005-0.8.1-add-_tmp.patch"
+      patch_description: "add _tmp variables in sort macros"
+      patch_type: "portability"
   "0.8.1":
     - patch_file: "patches/0001-0.8.1-shared-win32.patch"
       patch_description: "fix UCL_EXTERN definition for shared build on win32"
@@ -32,3 +35,6 @@ patches:
     - patch_file: "patches/0004-0.8.1-cmake-minimum-required.patch"
       patch_description: "declare cmake_minimum_required first"
       patch_type: "portability"
+    - patch_file: "patches/0005-0.8.1-add-_tmp.patch"
+      patch_description: "add _tmp variables in sort macros"
+      patch_type: "portability"
diff --git a/recipes/libucl/all/patches/0005-0.8.1-add-_tmp.patch b/recipes/libucl/all/patches/0005-0.8.1-add-_tmp.patch
@@ -0,0 +1,20 @@
+diff --git a/a/uthash/utlist.h b/b/uthash/utlist.h
+index c82dd91..7369161 100644
+--- a/a/uthash/utlist.h
++++ b/b/uthash/utlist.h
+@@ -111,6 +111,7 @@ do {
+   LDECLTYPE(list) _ls_q;                                                                       \
+   LDECLTYPE(list) _ls_e;                                                                       \
+   LDECLTYPE(list) _ls_tail;                                                                    \
++  LDECLTYPE(list) _tmp;                                                                        \
+   int _ls_insize, _ls_nmerges, _ls_psize, _ls_qsize, _ls_i, _ls_looping;                       \
+   if (list) {                                                                                  \
+     _ls_insize = 1;                                                                            \
+@@ -174,6 +175,7 @@ do {
+   LDECLTYPE(list) _ls_q;                                                                       \
+   LDECLTYPE(list) _ls_e;                                                                       \
+   LDECLTYPE(list) _ls_tail;                                                                    \
++  LDECLTYPE(list) _tmp;                                                                        \
+   int _ls_insize, _ls_nmerges, _ls_psize, _ls_qsize, _ls_i, _ls_looping;                       \
+   if (list) {                                                                                  \
+     _ls_insize = 1;                                                                            \