--- a/libpurple/protocols/zephyr/sysdep.h Mon Sep 16 19:50:39 2019 -0400 +++ b/libpurple/protocols/zephyr/sysdep.h Mon Sep 16 20:27:43 2019 -0400 @@ -35,12 +35,6 @@ #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif #ifdef HAVE_SYS_CDEFS_H #include <sys/cdefs.h> @@ -48,26 +42,10 @@ #include <stdarg.h> -/* openlog(). */ -#ifdef LOG_AUTH -/* A decent syslog */ -#define OPENLOG(str, opts, facility) openlog(str, opts, facility) -#else -/* Probably a 4.2-type syslog */ -#define OPENLOG(str, opts, facility) openlog(str, opts) -#endif - #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif -#ifdef HAVE_PATHS_H -# include <paths.h> -# define TEMP_DIRECTORY _PATH_VARTMP -#else -# define TEMP_DIRECTORY FOUND_TMP -#endif - #ifdef HAVE_UNISTD_H # include <unistd.h> #else @@ -76,15 +54,6 @@ # endif uid_t getuid(void); char *ttyname(void); -#ifdef HAVE_GETHOSTID -ZEPHYR_INT32 gethostid(void); -#endif -#endif - -#ifndef STDIN_FILENO -#define STDIN_FILENO 0 -#define STDOUT_FILENO 1 -#define STDERR_FILENO 2 #endif #ifdef HAVE_TERMIOS_H @@ -105,30 +74,18 @@ /* Kerberos compatibility. */ #ifdef ZEPHYR_USES_KERBEROS # include <krb.h> -#ifdef WIN32 - -#else -# include <krb_err.h> -#endif /* WIN32 */ +# ifndef WIN32 +# include <krb_err.h> +# ifndef HAVE_KRB_GET_ERR_TEXT +# define krb_get_err_text(n) krb_err_txt[n] +# endif +# endif /* WIN32 */ # include <des.h> -#ifndef WIN32 -# ifndef HAVE_KRB_GET_ERR_TEXT -# define krb_get_err_text(n) krb_err_txt[n] -# endif -#endif /* WIN32 */ # ifndef HAVE_KRB_LOG # define krb_log log # endif #endif /* ZEPHYR_USES_KERBEROS */ -#ifdef HAVE_SYS_UIO_H -# include <sys/uio.h> -#endif - -#ifdef HAVE_SYS_UTSNAME_H -# include <sys/utsname.h> -#endif - #ifdef HAVE_SYS_SELECT_H # include <sys/select.h> #endif @@ -137,8 +94,4 @@ #include <sys/msgbuf.h> #endif -#ifndef MSG_BSIZE -#define MSG_BSIZE BUFSIZ -#endif - #endif /* PURPLE_ZEPHYR_SYSDEP_H */