diff options
author | bors <bors@rust-lang.org> | 2021-10-30 17:36:16 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2021-10-30 17:36:16 +0000 |
commit | 6cb6f69ae6296f1cd4585b0b3abe22dfd4e0adf6 (patch) | |
tree | 4edcbd3fef29861779a39ad8d71b1502b4ee6aa5 | |
parent | abbfad26832a90e187c56cbbfd79049938ad960d (diff) | |
parent | 72c8a305c13c967bc5072b4fadc9d8fb1f7cf629 (diff) | |
download | rust-libc-6cb6f69ae6296f1cd4585b0b3abe22dfd4e0adf6.tar.gz |
Auto merge of #2490 - devnexen:macos_build_fix, r=JohnTitor
malloc_zone darwin build fix.
closes #2484
-rw-r--r-- | src/unix/bsd/apple/b64/x86_64/mod.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/unix/bsd/apple/b64/x86_64/mod.rs b/src/unix/bsd/apple/b64/x86_64/mod.rs index 2cd9cf4173..653650c262 100644 --- a/src/unix/bsd/apple/b64/x86_64/mod.rs +++ b/src/unix/bsd/apple/b64/x86_64/mod.rs @@ -110,62 +110,62 @@ s! { pub struct malloc_zone_t { _reserved1: *mut ::c_void, _reserved2: *mut ::c_void, - pub size: Option<unsafe extern "C" fn( + pub size: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, ptr: *const ::c_void, ) -> ::size_t>, - pub malloc: Option<unsafe extern "C" fn( + pub malloc: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, size: ::size_t, ) -> *mut ::c_void>, - pub calloc: Option<unsafe extern "C" fn( + pub calloc: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, num_items: ::size_t, size: ::size_t, ) -> *mut ::c_void>, - pub valloc: Option<unsafe extern "C" fn( + pub valloc: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, size: ::size_t ) -> *mut ::c_void>, - pub free: Option<unsafe extern "C" fn( + pub free: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, ptr: *mut ::c_void )>, - pub realloc: Option<unsafe extern "C" fn( + pub realloc: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, ptr: *mut ::c_void, size: ::size_t, ) -> *mut ::c_void>, - pub destroy: Option<unsafe extern "C" fn(zone: *mut malloc_zone_t)>, + pub destroy: ::Option<unsafe extern "C" fn(zone: *mut malloc_zone_t)>, pub zone_name: *const ::c_char, - pub batch_malloc: Option<unsafe extern "C" fn( + pub batch_malloc: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, size: ::size_t, results: *mut *mut ::c_void, num_requested: ::c_uint, ) -> ::c_uint>, - pub batch_free: Option<unsafe extern "C" fn( + pub batch_free: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, to_be_freed: *mut *mut ::c_void, num_to_be_freed: ::c_uint, )>, pub introspect: *mut malloc_introspection_t, pub version: ::c_uint, - pub memalign: Option<unsafe extern "C" fn( + pub memalign: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, alignment: ::size_t, size: ::size_t, ) -> *mut ::c_void>, - pub free_definite_size: Option<unsafe extern "C" fn( + pub free_definite_size: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, ptr: *mut ::c_void, size: ::size_t )>, - pub pressure_relief: Option<unsafe extern "C" fn( + pub pressure_relief: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, goal: ::size_t, ) -> ::size_t>, - pub claimed_address: Option<unsafe extern "C" fn( + pub claimed_address: ::Option<unsafe extern "C" fn( zone: *mut malloc_zone_t, ptr: *mut ::c_void, ) -> ::boolean_t>, |