moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

win: Basic support for Universal Windows Platform apps

Browse Source 
Closes #820
This commit is contained in:
Marco Deckel 2016-08-21 13:44:33 +02:00 committed by Daniel Stenberg
parent a78c61a4bf
commit 7f3df80408
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/connect.c
View File

@ -130,6 +130,9 @@ tcpkeepalive(struct Curl_easy *data,
infof(data, "Failed to set SIO_KEEPALIVE_VALS on fd %d: %d\n", infof(data, "Failed to set SIO_KEEPALIVE_VALS on fd %d: %d\n",
(int)sockfd, WSAGetLastError()); (int)sockfd, WSAGetLastError());
} }
#elif defined(CURL_WINDOWS_APP)
(void)majorVersion;
detectOsState = DETECT_OS_VISTA_OR_LATER;
#else #else
#ifdef TCP_KEEPIDLE #ifdef TCP_KEEPIDLE
optval = curlx_sltosi(data->set.tcp_keepidle); optval = curlx_sltosi(data->set.tcp_keepidle);

10
lib/curl_setup.h
View File

@ -747,4 +747,14 @@ endings either CRLF or LF so 't' is appropriate.
# endif # endif
#endif /* DONT_USE_RECV_BEFORE_SEND_WORKAROUNDS */ #endif /* DONT_USE_RECV_BEFORE_SEND_WORKAROUNDS */
/* Detect Windows App environment which has a restricted access
* to the Win32 APIs. */
# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602)
# include <winapifamily.h>
# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
# define CURL_WINDOWS_APP
# endif
# endif
#endif /* HEADER_CURL_SETUP_H */ #endif /* HEADER_CURL_SETUP_H */

3
lib/getenv.c
View File

@ -30,7 +30,8 @@
static static
char *GetEnv(const char *variable) char *GetEnv(const char *variable)
{ {
#ifdef _WIN32_WCE #if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP)
(void)variable;
return NULL; return NULL;
#else #else
#ifdef WIN32 #ifdef WIN32

2
lib/md5.c
View File

@ -124,7 +124,7 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX *ctx)
CC_MD5_Final(digest, ctx); CC_MD5_Final(digest, ctx);
} }
#elif defined(_WIN32) #elif defined(_WIN32) && !defined(CURL_WINDOWS_APP)
#include <wincrypt.h> #include <wincrypt.h>
#include "curl_memory.h" #include "curl_memory.h"