ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-19 13:17:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Quick fix to unbreak android build too

Browse Source
This commit is contained in:
Jeremy Lakeman 2015-11-23 11:12:04 +10:30
parent f774d12686
commit 67c1f382d4
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mem.h
View File

@ -38,7 +38,7 @@ void _serval_debug_free(void *p, struct __sourceloc whence);
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
#if defined(__GNUC__) && !defined(__clang__)
#if defined(__GNUC__) && !defined(__clang__) && !defined(ANDROID)
void *_emalloc(struct __sourceloc, size_t bytes) __attribute__ ((malloc, alloc_size(2), returns_nonnull));
#else
void *_emalloc(struct __sourceloc, size_t bytes) __attribute__ ((malloc));
@ -48,7 +48,7 @@ void *_emalloc(struct __sourceloc, size_t bytes) __attribute__ ((malloc));
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
#if defined(__GNUC__) && !defined(__clang__)
#if defined(__GNUC__) && !defined(__clang__) && !defined(ANDROID)
void *_erealloc(struct __sourceloc __whence, void *ptr, size_t bytes) __attribute__ ((alloc_size(3), returns_nonnull));
#else
void *_erealloc(struct __sourceloc __whence, void *ptr, size_t bytes);
@ -58,7 +58,7 @@ void *_erealloc(struct __sourceloc __whence, void *ptr, size_t bytes);
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
#if defined(__GNUC__) && !defined(__clang__)
#if defined(__GNUC__) && !defined(__clang__) && !defined(ANDROID)
void *_emalloc_zero(struct __sourceloc, size_t bytes) __attribute__ ((malloc, alloc_size(2), returns_nonnull));
#else
void *_emalloc_zero(struct __sourceloc, size_t bytes) __attribute__ ((malloc));
@ -70,8 +70,13 @@ void *_emalloc_zero(struct __sourceloc, size_t bytes) __attribute__ ((malloc));
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
#if defined(__GNUC__) && !defined(__clang__) && !defined(ANDROID)
char *_str_edup(struct __sourceloc, const char *str) __attribute__ ((malloc, returns_nonnull));
char *_strn_edup(struct __sourceloc, const char *str, size_t len) __attribute__ ((malloc, returns_nonnull));
#else
char *_str_edup(struct __sourceloc, const char *str) __attribute__ ((malloc));
char *_strn_edup(struct __sourceloc, const char *str, size_t len) __attribute__ ((malloc));
#endif
#define emalloc(bytes) _emalloc(__HERE__, (bytes))
#define erealloc(ptr, bytes) _erealloc(__HERE__, (ptr), (bytes))

2
strbuf.h
View File

@ -282,7 +282,7 @@ typedef const struct strbuf *const_strbuf;
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
#if defined(__GNUC__) && !defined(__clang__)
#if defined(__GNUC__) && !defined(__clang__) && !defined(ANDROID)
#define strbuf_local_buf(buf) strbuf_local((char*)(buf), (sizeof(buf) == __builtin_object_size(buf, 1)) ? sizeof(buf) : __buffer_arg_is_not_array())
#else
#define strbuf_local_buf(buf) strbuf_local((char*)(buf), sizeof(buf))