File tree 3 files changed +9
-18
lines changed
3 files changed +9
-18
lines changed Original file line number Diff line number Diff line change 20
20
#define WIN_EXPORT
21
21
#endif
22
22
23
- #ifdef WINARMDLL
24
- #define WIN_STRUCT (type ) type*
25
- #define WIN_STRUCT_REF (value ) &value
26
- #else
27
- #define WIN_STRUCT (type ) type
28
- #define WIN_STRUCT_REF (value ) value
29
- #endif
30
-
31
23
#ifdef NS_ENUM
32
24
// Cannot use NSInteger as NSInteger has a different size than int (which is the
33
25
// default type of a enum). Therefor when linking the Yoga C library into obj-c
Original file line number Diff line number Diff line change @@ -602,12 +602,12 @@ inline detail::CompactValue Value::create<YGUnitAuto>(float) {
602
602
template <YGStyle::Dimensions YGStyle::*P>
603
603
struct DimensionProp {
604
604
template <YGDimension idx>
605
- static WIN_STRUCT ( YGValue) get(YGNodeRef node) {
605
+ static YGValue get (YGNodeRef node) {
606
606
YGValue value = (node->getStyle ().*P)[idx];
607
607
if (value.unit == YGUnitUndefined || value.unit == YGUnitAuto) {
608
608
value.value = YGUndefined;
609
609
}
610
- return WIN_STRUCT_REF ( value) ;
610
+ return value;
611
611
}
612
612
613
613
template <YGDimension idx, YGUnit U>
@@ -690,13 +690,12 @@ struct DimensionProp {
690
690
} \
691
691
} \
692
692
\
693
- WIN_STRUCT (type) \
694
- YGNodeStyleGet##name(const YGNodeRef node, const YGEdge edge) { \
693
+ type YGNodeStyleGet##name(const YGNodeRef node, const YGEdge edge) { \
695
694
YGValue value = node->getStyle ().instanceName [edge]; \
696
695
if (value.unit == YGUnitUndefined || value.unit == YGUnitAuto) { \
697
696
value.value = YGUndefined; \
698
697
} \
699
- return WIN_STRUCT_REF ( value); \
698
+ return value; \
700
699
}
701
700
702
701
#define YG_NODE_LAYOUT_PROPERTY_IMPL (type, name, instanceName ) \
Original file line number Diff line number Diff line change @@ -140,11 +140,11 @@ YGDirtiedFunc YGNodeGetDirtiedFunc(YGNodeRef node);
140
140
void YGNodeSetDirtiedFunc (YGNodeRef node, YGDirtiedFunc dirtiedFunc);
141
141
YGPrintFunc YGNodeGetPrintFunc (YGNodeRef node);
142
142
void YGNodeSetPrintFunc (YGNodeRef node, YGPrintFunc printFunc);
143
- bool YGNodeGetHasNewLayout (YGNodeRef node);
144
- void YGNodeSetHasNewLayout (YGNodeRef node, bool hasNewLayout);
143
+ WIN_EXPORT bool YGNodeGetHasNewLayout (YGNodeRef node);
144
+ WIN_EXPORT void YGNodeSetHasNewLayout (YGNodeRef node, bool hasNewLayout);
145
145
YGNodeType YGNodeGetNodeType (YGNodeRef node);
146
146
void YGNodeSetNodeType (YGNodeRef node, YGNodeType nodeType);
147
- bool YGNodeIsDirty (YGNodeRef node);
147
+ WIN_EXPORT bool YGNodeIsDirty (YGNodeRef node);
148
148
bool YGNodeLayoutGetDidUseLegacyFlag (const YGNodeRef node);
149
149
150
150
WIN_EXPORT void YGNodeStyleSetDirection (
@@ -227,8 +227,8 @@ WIN_EXPORT void YGNodeStyleSetPositionPercent(
227
227
const YGNodeRef node,
228
228
const YGEdge edge,
229
229
const float position);
230
- WIN_EXPORT WIN_STRUCT ( YGValue)
231
- YGNodeStyleGetPosition(const YGNodeRef node, const YGEdge edge);
230
+ WIN_EXPORT YGValue
231
+ YGNodeStyleGetPosition (const YGNodeRef node, const YGEdge edge);
232
232
233
233
WIN_EXPORT void YGNodeStyleSetMargin (
234
234
const YGNodeRef node,
You can’t perform that action at this time.
0 commit comments