yetangitu/fernly
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bionic: fix gcc build

Browse source 
The memset() prototype from glibc includes __THROW and __nonnull as
decorators, which are nonstandard.  Remove these for additional
compatibility with gcc.

Additionally, remove linux/types.h and linux/string.h, and replace them
with sys/types.h and sys/string.h.
This commit is contained in:
Mandl 2015-01-12 21:58:43 +01:00 • committed by Sean Cross
parent e948d27bb0
commit eba08f0218
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/bionic.h
View file

@ -9,7 +9,7 @@ char * _strpbrk(const char *s1, const char *s2);
char *_strtok(char *str, const char *delim, char **saveptr);
int _strcasecmp(const char *s1, const char *s2);
void *_memcpy(void *dst0, const void *src0, size_t length);
void *memset(void *__s, int __c, size_t __n) __THROW __nonnull ((1));
void *memset(void *__s, int __c, size_t __n);
unsigned long strtoul(const char *nptr, char **endptr, unsigned int base);
int _strlen(const char *s);
int _strnlen(const char *s, uint32_t maxlen);

4
vsprintf.c
View file

@ -12,8 +12,8 @@
*/
#include <stdarg.h>
#include <linux/types.h>
#include <linux/string.h>
#include <sys/types.h>
#include <sys/string.h>
#include <errno.h>
#include <stdint.h>
#include "bionic.h"