From 2489c1d024906d0f72bbcf709aeb53a24602c219 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Mon, 28 Feb 2022 22:42:10 +0100 Subject: Remove useless __CYGWIN__ checks From what I can tell, some really early Cygwin versions from around 1998-2000 used to erroneously define _WIN32. This was eventually fixed, but these days, the `defined(_WIN32) && !defined(__CYGWIN__)` idiom is unnecessary. Now, we only check for __CYGWIN__ in xmlexports.h when deciding whether to use __declspec. --- xmllint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xmllint.c') diff --git a/xmllint.c b/xmllint.c index b314189f..ef25c052 100644 --- a/xmllint.c +++ b/xmllint.c @@ -2202,7 +2202,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { if ((filename[0] == '-') && (filename[1] == 0)) { f = stdin; } else { -#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) +#if defined(_WIN32) || defined (__DJGPP__) f = fopen(filename, "rb"); #elif defined(__OS400__) f = fopen(filename, "rb"); @@ -2278,7 +2278,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { if ((filename[0] == '-') && (filename[1] == 0)) { f = stdin; } else { -#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) +#if defined(_WIN32) || defined (__DJGPP__) f = fopen(filename, "rb"); #elif defined(__OS400__) f = fopen(filename, "rb"); @@ -2327,7 +2327,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) { } else { FILE *f; -#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) +#if defined(_WIN32) || defined (__DJGPP__) f = fopen(filename, "rb"); #elif defined(__OS400__) f = fopen(filename, "rb"); -- cgit v1.2.1