resolve conflict

aky15

2023-03-21 4dc3a1b011e1e72eb737417b8e0e0bec7a7e3a6e

1
2
3
4
5
6
7
8
9
10
 
#ifndef ALIGNEDMEM_H
#define ALIGNEDMEM_H
 
 
 
extern void *aligned_malloc(size_t alignment, size_t required_bytes);
extern void aligned_free(void *p);
 
#endif