forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 640e6cace..e58eb27a8
e58eb27a8 fix(toxav): remove extra copy of video frame on encode Tested and works, but there might be alignment issues and other stuff. 206ea3530 refactor: Explicitly pass dependencies to constructors. 7cefa93cf fix(toxencryptsave): Wipe salt and passkey after usage. 7c3be2342 refactor: Add file/line to tox-bootstrapd logging. f84e8cdce refactor: Move loglogdata out of network.c. 390f7db06 refactor: Move random and memory OS-specifics to `os_*` files. REVERT: 640e6cace fix(toxav): remove extra copy of video frame on encode Tested and works, but there might be alignment issues and other stuff. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: e58eb27a84f9fa0cd996868e079f39e90a5c04b6
This commit is contained in:
@@ -12,30 +12,13 @@
|
||||
#include <stdint.h> // uint*_t
|
||||
|
||||
#include "attributes.h"
|
||||
#include "tox_memory.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef void *mem_malloc_cb(void *_Nullable obj, uint32_t size);
|
||||
typedef void *mem_calloc_cb(void *_Nullable obj, uint32_t nmemb, uint32_t size);
|
||||
typedef void *mem_realloc_cb(void *_Nullable obj, void *_Nullable ptr, uint32_t size);
|
||||
typedef void mem_free_cb(void *_Nullable obj, void *_Nullable ptr);
|
||||
|
||||
/** @brief Functions wrapping standard C memory allocation functions. */
|
||||
typedef struct Memory_Funcs {
|
||||
mem_malloc_cb *_Nullable malloc;
|
||||
mem_calloc_cb *_Nullable calloc;
|
||||
mem_realloc_cb *_Nullable realloc;
|
||||
mem_free_cb *_Nullable free;
|
||||
} Memory_Funcs;
|
||||
|
||||
typedef struct Memory {
|
||||
const Memory_Funcs *_Nullable funcs;
|
||||
void *_Nullable obj;
|
||||
} Memory;
|
||||
|
||||
const Memory *_Nullable os_memory(void);
|
||||
typedef Tox_Memory Memory;
|
||||
|
||||
/**
|
||||
* @brief Allocate an array of a given size for built-in types.
|
||||
|
||||
Reference in New Issue
Block a user