--- a/libpurple/protocols/zephyr/sysdep.h Tue Sep 06 14:45:30 2016 -0500 +++ b/libpurple/protocols/zephyr/sysdep.h Sun Aug 28 20:43:17 2016 -0400 @@ -26,17 +26,7 @@ #include <sys/param.h> #include <sys/time.h> -#if defined(STDC_HEADERS) || defined(HAVE_STDLIB_H) -# include <stdlib.h> -#else -# ifdef HAVE_MALLOC_H -# include <malloc.h> -# else -char *malloc(), *realloc(void); -# endif -char *getenv(), *strerror(), *ctime(), *strcpy(void); -time_t time(void); -#endif +#include <stdlib.h> #ifndef HAVE_STRERROR extern char *sys_errlist[]; @@ -44,22 +34,7 @@ #endif /* Strings. */ -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -# include <string.h> -#else -# ifndef HAVE_STRCHR -# define strchr index -# define strrchr rindex -# endif -char *strchr(), *strrchr(void); -# ifndef HAVE_MEMCPY -# define memcpy(d, s, n) bcopy ((s), (d), (n)) -# define memcmp bcmp -# endif -# ifndef HAVE_MEMMOVE -# define memmove(d, s, n) bcopy ((s), (d), (n)) -# endif -#endif +#include <string.h> /* Exit status handling and wait(). */ #ifdef HAVE_SYS_WAIT_H