[libxslt] Remove useless __CYGWIN__ checks



commit 74e87f96aa9ea0eaa9d9f6396220280f5ab8beba
Author: Nick Wellnhofer <wellnhofer aevum de>
Date:   Thu Mar 31 01:55:29 2022 +0200

    Remove useless __CYGWIN__ checks

 libexslt/crypto.c    | 2 +-
 libexslt/libexslt.h  | 2 +-
 libxslt/libxslt.h    | 2 +-
 libxslt/security.c   | 6 +++---
 libxslt/xsltlocale.h | 2 +-
 libxslt/xsltutils.c  | 2 +-
 xsltproc/xsltproc.c  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/libexslt/crypto.c b/libexslt/crypto.c
index 81f5b84e..8845a132 100644
--- a/libexslt/crypto.c
+++ b/libexslt/crypto.c
@@ -102,7 +102,7 @@ exsltCryptoHex2Bin (const unsigned char *hex, int hexlen,
     return j;
 }
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32)
 
 #define HAVE_CRYPTO
 #define PLATFORM_HASH  exsltCryptoCryptoApiHash
diff --git a/libexslt/libexslt.h b/libexslt/libexslt.h
index ad9cc748..29575460 100644
--- a/libexslt/libexslt.h
+++ b/libexslt/libexslt.h
@@ -9,7 +9,7 @@
 #ifndef __XSLT_LIBEXSLT_H__
 #define __XSLT_LIBEXSLT_H__
 
-#if defined(_WIN32) && !defined (__CYGWIN__) && !defined (__MINGW32__)
+#if defined(_WIN32) && !defined (__MINGW32__)
 #include <win32config.h>
 #else
 #include "config.h"
diff --git a/libxslt/libxslt.h b/libxslt/libxslt.h
index 5e98158e..2b0c8b09 100644
--- a/libxslt/libxslt.h
+++ b/libxslt/libxslt.h
@@ -10,7 +10,7 @@
 #ifndef __XSLT_LIBXSLT_H__
 #define __XSLT_LIBXSLT_H__
 
-#if defined(_WIN32) && !defined (__CYGWIN__) && !defined (__MINGW32__)
+#if defined(_WIN32) && !defined (__MINGW32__)
 #include <win32config.h>
 #else
 #include "config.h"
diff --git a/libxslt/security.c b/libxslt/security.c
index 5cae4da4..1f7187c7 100644
--- a/libxslt/security.c
+++ b/libxslt/security.c
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 #endif
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32)
 #include <windows.h>
 #ifndef INVALID_FILE_ATTRIBUTES
 #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
@@ -263,7 +263,7 @@ xsltCheckFilename (const char *path)
 {
 #ifdef HAVE_STAT
     struct stat stat_buffer;
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32)
     DWORD dwAttrs;
 
     dwAttrs = GetFileAttributesA(path);
@@ -368,7 +368,7 @@ xsltCheckWrite(xsltSecurityPrefsPtr sec,
     if ((uri->scheme == NULL) ||
        (xmlStrEqual(BAD_CAST uri->scheme, BAD_CAST "file"))) {
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32)
         if ((uri->path)&&(uri->path[0]=='/')&&
             (uri->path[1]!='\0')&&(uri->path[2]==':'))
             ret = xsltCheckWritePath(sec, ctxt, uri->path+1);
diff --git a/libxslt/xsltlocale.h b/libxslt/xsltlocale.h
index f3b9d6e0..dc503895 100644
--- a/libxslt/xsltlocale.h
+++ b/libxslt/xsltlocale.h
@@ -32,7 +32,7 @@
 typedef locale_t xsltLocale;
 typedef xmlChar xsltLocaleChar;
 
-#elif defined(_WIN32) && !defined(__CYGWIN__)
+#elif defined(_WIN32)
 
 /*
  * XSLT_LOCALE_WINAPI:
diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c
index 28a7f2d7..f352ca1b 100644
--- a/libxslt/xsltutils.c
+++ b/libxslt/xsltutils.c
@@ -41,7 +41,7 @@
 #include "imports.h"
 #include "transform.h"
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32)
 #define XSLT_WIN32_PERFORMANCE_COUNTER
 #endif
 
diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
index 90bb9fd3..7edcc536 100644
--- a/xsltproc/xsltproc.c
+++ b/xsltproc/xsltproc.c
@@ -25,7 +25,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32)
 #include <fcntl.h>
 #endif
 #include <libxml/xmlmemory.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]