Skip to content

Commit 46eaee4

Browse files
committed
macos: fix native release and Linux cross compile
1 parent ceb6b91 commit 46eaee4

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

vlib/crypto/ecdsa/ecdsa.c.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module ecdsa
55

66
// See https://docs.openssl.org/master/man7/openssl_user_macros/#description
77
// should be 0x30000000L, but a lot of EC_KEY method was deprecated on version 3.0
8-
// #define OPENSSL_API_COMPAT 0x10100000L
8+
#define OPENSSL_API_COMPAT 0x10100000L
99

1010
#flag darwin -L/opt/homebrew/opt/openssl/lib
1111
#flag darwin -I/opt/homebrew/opt/openssl/include

vlib/net/openssl/openssl.c.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module openssl
22

3-
#define OPENSSL_API_COMPAT 0x30000000L
3+
#define OPENSSL_API_COMPAT 0x10100000L
44

55
// On Linux, prefer a locally built openssl, because it is
66
// much more likely for it to be newer, than the system

vlib/x/multiwindow/appkit_backend.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2759,7 +2759,7 @@ VMultiwindowNativePrimitive v_multiwindow_appkit_release_metal_device(void *devi
27592759
released_subject = V_MULTIWINDOW_APPKIT_SIDE_EFFECT_SUBJECT_DEVICE_ROOT;
27602760
}
27612761
#endif
2762-
CFBridgingRelease(device);
2762+
CFRelease(device);
27632763
#if defined(SOKOL_TRACE_HOOKS) && defined(V_MULTIWINDOW_NATIVE_PROOF_TEST)
27642764
v_multiwindow_appkit_side_effect_append(
27652765
V_MULTIWINDOW_APPKIT_SIDE_EFFECT_BRIDGE_RELEASE,
@@ -3177,7 +3177,7 @@ VMultiwindowNativePrimitive v_multiwindow_appkit_release_window(void *state_ptr)
31773177
const uint64_t released_subject =
31783178
v_multiwindow_appkit_side_effect_root_subject(released_identity);
31793179
#endif
3180-
CFBridgingRelease(state_ptr);
3180+
CFRelease(state_ptr);
31813181
#if defined(SOKOL_TRACE_HOOKS) && defined(V_MULTIWINDOW_NATIVE_PROOF_TEST)
31823182
v_multiwindow_appkit_side_effect_append(
31833183
V_MULTIWINDOW_APPKIT_SIDE_EFFECT_BRIDGE_RELEASE,

0 commit comments

Comments
 (0)