Skip to content

Commit 7025a8f

Browse files
committed
fix msvc build
1 parent 320c55b commit 7025a8f

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed

recipes/libucl/all/conandata.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ patches:
1919
- patch_file: "patches/0004-0.8.2-cmake-minimum-required.patch"
2020
patch_description: "declare cmake_minimum_required first"
2121
patch_type: "portability"
22+
- patch_file: "patches/0005-0.8.1-add-_tmp.patch"
23+
patch_description: "add _tmp variables in sort macros"
24+
patch_type: "portability"
2225
"0.8.1":
2326
- patch_file: "patches/0001-0.8.1-shared-win32.patch"
2427
patch_description: "fix UCL_EXTERN definition for shared build on win32"
@@ -32,3 +35,6 @@ patches:
3235
- patch_file: "patches/0004-0.8.1-cmake-minimum-required.patch"
3336
patch_description: "declare cmake_minimum_required first"
3437
patch_type: "portability"
38+
- patch_file: "patches/0005-0.8.1-add-_tmp.patch"
39+
patch_description: "add _tmp variables in sort macros"
40+
patch_type: "portability"
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/a/uthash/utlist.h b/b/uthash/utlist.h
2+
index c82dd91..7369161 100644
3+
--- a/a/uthash/utlist.h
4+
+++ b/b/uthash/utlist.h
5+
@@ -111,6 +111,7 @@ do {
6+
LDECLTYPE(list) _ls_q; \
7+
LDECLTYPE(list) _ls_e; \
8+
LDECLTYPE(list) _ls_tail; \
9+
+ LDECLTYPE(list) _tmp; \
10+
int _ls_insize, _ls_nmerges, _ls_psize, _ls_qsize, _ls_i, _ls_looping; \
11+
if (list) { \
12+
_ls_insize = 1; \
13+
@@ -174,6 +175,7 @@ do {
14+
LDECLTYPE(list) _ls_q; \
15+
LDECLTYPE(list) _ls_e; \
16+
LDECLTYPE(list) _ls_tail; \
17+
+ LDECLTYPE(list) _tmp; \
18+
int _ls_insize, _ls_nmerges, _ls_psize, _ls_qsize, _ls_i, _ls_looping; \
19+
if (list) { \
20+
_ls_insize = 1; \

0 commit comments

Comments
 (0)