From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Sun, 26 Apr 2015 11:27:44 +0000 (+0200)
Subject: Drop workarounds for WinCE and Interix
X-Git-Tag: 1.9.9-b1~881
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e70386339041d5b7fa4b5dbfc7787dc6c1c05a4;p=thirdparty%2Fzlib-ng.git

Drop workarounds for WinCE and Interix
---

diff --git a/zconf.h b/zconf.h
index 16d90ee48..4a4beaf14 100644
--- a/zconf.h
+++ b/zconf.h
@@ -155,7 +155,7 @@
 #if defined(_WINDOWS) && !defined(WINDOWS)
 #  define WINDOWS
 #endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#if defined(_WIN32) || defined(__WIN32__)
 #  ifndef WIN32
 #    define WIN32
 #  endif
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index f80587c91..92d461d07 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -157,7 +157,7 @@
 #if defined(_WINDOWS) && !defined(WINDOWS)
 #  define WINDOWS
 #endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#if defined(_WIN32) || defined(__WIN32__)
 #  ifndef WIN32
 #    define WIN32
 #  endif
diff --git a/zconf.h.in b/zconf.h.in
index 16d90ee48..4a4beaf14 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -155,7 +155,7 @@
 #if defined(_WINDOWS) && !defined(WINDOWS)
 #  define WINDOWS
 #endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#if defined(_WIN32) || defined(__WIN32__)
 #  ifndef WIN32
 #    define WIN32
 #  endif
diff --git a/zutil.c b/zutil.c
index cf40cc69b..adb470f87 100644
--- a/zutil.c
+++ b/zutil.c
@@ -107,14 +107,6 @@ const char * ZEXPORT zError(err)
     return ERR_MSG(err);
 }
 
-#if defined(_WIN32_WCE)
-    /* 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.
-     */
-    int errno = 0;
-#endif
-
 #ifndef Z_SOLO
 
 #ifndef MY_ZCALLOC /* Any system without a special alloc function */
diff --git a/zutil.h b/zutil.h
index e6851679c..6ec9155a0 100644
--- a/zutil.h
+++ b/zutil.h
@@ -22,7 +22,7 @@
 #include "zlib.h"
 
 #ifndef Z_SOLO
-#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
+#  if defined(_MSC_VER))
 #    include <stddef.h>
 #  endif
 #  include <string.h>
@@ -84,16 +84,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#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
-#  else
-#    define fdopen(fd,type)  _fdopen(fd,type)
-#  endif
+#if (defined(_MSC_VER) && (_MSC_VER > 600))
+#  define fdopen(fd,type)  _fdopen(fd,type)
 #endif
 
 /* provide prototypes for these when building zlib without LFS */