early-access version 2698

externals/libressl/include/compat/arpa/nameser.h

@@ -4,7 +4,9 @@
  */
 
 #ifndef _WIN32
+#ifdef HAVE_ARPA_NAMESER_H
 #include_next <arpa/nameser.h>
+#endif
 #else
 #include <win32netcompat.h>
 

externals/libressl/include/compat/endian.h

@@ -0,0 +1,48 @@
+/*
+ * Public domain
+ * endian.h compatibility shim
+ */
+
+#ifndef LIBCRYPTOCOMPAT_BYTE_ORDER_H_
+#define LIBCRYPTOCOMPAT_BYTE_ORDER_H_
+
+#if defined(_WIN32)
+
+#define LITTLE_ENDIAN  1234
+#define BIG_ENDIAN 4321
+#define PDP_ENDIAN	3412
+
+/*
+ * Use GCC and Visual Studio compiler defines to determine endian.
+ */
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define BYTE_ORDER LITTLE_ENDIAN
+#else
+#define BYTE_ORDER BIG_ENDIAN
+#endif
+
+#elif defined(HAVE_ENDIAN_H)
+#include_next <endian.h>
+
+#elif defined(__sun) || defined(_AIX) || defined(__hpux)
+#include <sys/types.h>
+#include <arpa/nameser_compat.h>
+
+#elif defined(__sgi)
+#include <standards.h>
+#include <sys/endian.h>
+
+#endif
+
+#ifndef __STRICT_ALIGNMENT
+#define __STRICT_ALIGNMENT
+#if defined(__i386)    || defined(__i386__)    || \
+    defined(__x86_64)  || defined(__x86_64__)  || \
+    defined(__s390__)  || defined(__s390x__)   || \
+    defined(__aarch64__)                       || \
+    ((defined(__arm__) || defined(__arm)) && __ARM_ARCH >= 6)
+#undef __STRICT_ALIGNMENT
+#endif
+#endif
+
+#endif

externals/libressl/include/compat/err.h

@@ -72,16 +72,22 @@ warn(const char *fmt, ...)
 	fprintf(stderr, "%s\n", strerror(sverrno));
 }
 
+static inline void
+vwarnx(const char *fmt, va_list args)
+{
+	if (fmt != NULL)
+		vfprintf(stderr, fmt, args);
+	fprintf(stderr, "\n");
+}
+
 static inline void
 warnx(const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	if (fmt != NULL)
-		vfprintf(stderr, fmt, ap);
+	vwarnx(fmt, ap);
 	va_end(ap);
-	fprintf(stderr, "\n");
 }
 
 #endif

externals/libressl/include/compat/netinet/ip.h

@@ -8,7 +8,9 @@
 #endif
 
 #ifndef _WIN32
+#ifdef HAVE_NETINET_IP_H
 #include_next <netinet/ip.h>
+#endif
 #else
 #include <win32netcompat.h>
 #endif

externals/libressl/include/compat/pthread.h

@@ -102,6 +102,14 @@ pthread_mutex_unlock(pthread_mutex_t *mutex)
 	return 0;
 }
 
+static inline int
+pthread_mutex_destroy(pthread_mutex_t *mutex)
+{
+	DeleteCriticalSection(mutex->lock);
+	free(mutex->lock);
+	return 0;
+}
+
 #else
 #include_next <pthread.h>
 #endif

externals/libressl/include/compat/resolv.h

@@ -12,7 +12,7 @@
 #else
 #include <../include/resolv.h>
 #endif
-#else
+#elif defined(HAVE_RESOLV_H)
 #include_next <resolv.h>
 #endif
 

externals/libressl/include/compat/sys/socket.h

@@ -10,6 +10,7 @@
 #endif
 
 #if !defined(SOCK_NONBLOCK) || !defined(SOCK_CLOEXEC)
+#define NEED_SOCKET_FLAGS
 #define SOCK_CLOEXEC            0x8000  /* set FD_CLOEXEC */
 #define SOCK_NONBLOCK           0x4000  /* set O_NONBLOCK */
 int bsd_socketpair(int domain, int type, int protocol, int socket_vector[2]);