Merge pull request #15059 from hugolm84:improved-support-for-wince

* Improve support for Windows Embedded Compact

* Remove redundant set(WINCE true) and format CMake
This commit is contained in:
Hugo Lindström
2019-07-24 22:12:09 +02:00
committed by Alexander Alekhin
parent ad092bf1ce
commit 2ee00e7f7d
10 changed files with 174 additions and 45 deletions
+1 -1
View File
@@ -136,7 +136,7 @@ const char * ZEXPORT zError(err)
return ERR_MSG(err);
}
#if defined(_WIN32_WCE)
#if defined(_WIN32_WCE) && _WIN32_WCE < 0x800
/* The Microsoft C Run-Time Library for Windows CE doesn't have
* errno. We define it as a global variable to simplify porting.
* Its value is always 0 and should not be used.
+7 -5
View File
@@ -169,11 +169,13 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
# if defined(_WIN32_WCE)
# define fdopen(fd,mode) NULL /* No fdopen() */
# ifndef _PTRDIFF_T_DEFINED
typedef int ptrdiff_t;
# define _PTRDIFF_T_DEFINED
# endif
# if _WIN32_WCE < 0x800
# define fdopen(fd,mode) NULL /* No fdopen() */
# ifndef _PTRDIFF_T_DEFINED
typedef int ptrdiff_t;
# define _PTRDIFF_T_DEFINED
# endif
# endif
# else
# define fdopen(fd,type) _fdopen(fd,type)
# endif