From 3bd6b8d07451d166528cc03977202f822280b00d Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Fri, 29 May 2015 17:11:11 +0200
Subject: [PATCH] Further simplify WINAPI_DESKTOP

---
 src/libsodium/sodium/utils.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c
index 86c994b5..ae0d2be8 100644
--- a/src/libsodium/sodium/utils.c
+++ b/src/libsodium/sodium/utils.c
@@ -23,13 +23,8 @@
 # include <unistd.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && (!defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
 # define WINAPI_DESKTOP
-# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
-#  undef WINAPI_DESKTOP
-# elif defined(WINAPI_FAMILY_ONE_PARTITION) && defined(WINAPI_FAMILY_DESKTOP) && !WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY_DESKTOP)
-#  undef WINAPI_DESKTOP
-# endif
 #endif
 
 #define CANARY_SIZE 16U