From 78f13f2c0b5236df6fba6ea698b1e5cde92be6a1 Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Thu, 3 Nov 2016 20:49:55 -0400 Subject: [PATCH] [Listener] Fix byte order macros for OpenBSD >= 5.6 --- owlps-listener/owlps-listener.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/owlps-listener/owlps-listener.h b/owlps-listener/owlps-listener.h index fbf4372..57c4c24 100644 --- a/owlps-listener/owlps-listener.h +++ b/owlps-listener/owlps-listener.h @@ -62,11 +62,22 @@ # else // __BYTE_ORDER # error "This program does not handle strange architectures." # endif // __BYTE_ORDER +/* Non-glibc systems (mostly BSDs at this point). + * - OpenBSD 5.6 and higher defines le*toh in . Former versions + * defined letoh* in . + * - NetBSD, FreeBSD and DragonFly define le*toh in . + */ #else // __GLIBC__ -# include -# ifdef OpenBSD -# define le32toh letoh32 -# define le16toh letoh16 +# if defined(OpenBSD) +# if OpenBSD < 201411 // OpenBSD < 5.6 +# include +# define le32toh letoh32 +# define le16toh letoh16 +# else // OpenBSD < 5.6 +# include +# endif // OpenBSD < 5.6 +# else // OpenBSD +# include # endif // OpenBSD #endif // __GLIBC__