c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove useless __CYGWIN__ checks

Browse Source 
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.
This commit is contained in:
Nick Wellnhofer 2022-02-28 22:42:10 +01:00
parent ea6e8f998d
commit 2489c1d024
16 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libxml/nanoftp.h
View File

@ -17,7 +17,7 @@
#ifdef LIBXML_FTP_ENABLED #ifdef LIBXML_FTP_ENABLED
/* Needed for portability to Windows 64 bits */ /* Needed for portability to Windows 64 bits */
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
#include <winsock2.h> #include <winsock2.h>
#else #else
/** /**

2
nanoftp.c
View File

@ -75,7 +75,7 @@
#endif #endif
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
#include <wsockcompat.h> #include <wsockcompat.h>
#endif #endif

2
nanohttp.c
View File

@ -73,7 +73,7 @@
#define XML_SOCKLEN_T unsigned int #define XML_SOCKLEN_T unsigned int
#endif #endif
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
#include <wsockcompat.h> #include <wsockcompat.h>
#endif #endif

2
parser.c
View File

@ -38,7 +38,7 @@
#define IN_LIBXML #define IN_LIBXML
#include "libxml.h" #include "libxml.h"
#if defined(_WIN32) && !defined (__CYGWIN__) #if defined(_WIN32)
#define XML_DIR_SEP '\\' #define XML_DIR_SEP '\\'
#else #else
#define XML_DIR_SEP '/' #define XML_DIR_SEP '/'

2
parserInternals.c
View File

@ -10,7 +10,7 @@
#define IN_LIBXML #define IN_LIBXML
#include "libxml.h" #include "libxml.h"
#if defined(_WIN32) && !defined (__CYGWIN__) #if defined(_WIN32)
#define XML_DIR_SEP '\\' #define XML_DIR_SEP '\\'
#else #else
#define XML_DIR_SEP '/' #define XML_DIR_SEP '/'

4
runsuite.c
View File

@ -9,7 +9,7 @@
#include "libxml.h" #include "libxml.h"
#include <stdio.h> #include <stdio.h>
#if !defined(_WIN32) || defined(__CYGWIN__) #if !defined(_WIN32)
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <string.h> #include <string.h>
@ -48,7 +48,7 @@ static int checkTestFile(const char *filename) {
if (stat(filename, &buf) == -1) if (stat(filename, &buf) == -1)
return(0); return(0);
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
if (!(buf.st_mode & _S_IFREG)) if (!(buf.st_mode & _S_IFREG))
return(0); return(0);
#else #else

10
runtest.c
View File

@ -14,7 +14,7 @@
#include "libxml.h" #include "libxml.h"
#include <stdio.h> #include <stdio.h>
#if !defined(_WIN32) || defined(__CYGWIN__) #if !defined(_WIN32)
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <string.h> #include <string.h>
@ -108,7 +108,7 @@ static int update_results = 0;
static char* temp_directory = NULL; static char* temp_directory = NULL;
static int checkTestFile(const char *filename); static int checkTestFile(const char *filename);
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
#include <windows.h> #include <windows.h>
#include <io.h> #include <io.h>
@ -599,7 +599,7 @@ static int checkTestFile(const char *filename) {
if (stat(filename, &buf) == -1) if (stat(filename, &buf) == -1)
return(0); return(0);
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
if (!(buf.st_mode & _S_IFREG)) if (!(buf.st_mode & _S_IFREG))
return(0); return(0);
#else #else
@ -4105,7 +4105,7 @@ thread_specific_data(void *private_data)
return(NULL); return(NULL);
} }
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
#include <windows.h> #include <windows.h>
#include <string.h> #include <string.h>
@ -4631,7 +4631,7 @@ main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) {
int i, a, ret = 0; int i, a, ret = 0;
int subset = 0; int subset = 0;
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
setvbuf(stdout, NULL, _IONBF, 0); setvbuf(stdout, NULL, _IONBF, 0);
setvbuf(stderr, NULL, _IONBF, 0); setvbuf(stderr, NULL, _IONBF, 0);
#endif #endif

4
runxmlconf.c
View File

@ -11,7 +11,7 @@
#ifdef LIBXML_XPATH_ENABLED #ifdef LIBXML_XPATH_ENABLED
#if !defined(_WIN32) || defined(__CYGWIN__) #if !defined(_WIN32)
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <string.h> #include <string.h>
@ -53,7 +53,7 @@ static int checkTestFile(const char *filename) {
if (stat(filename, &buf) == -1) if (stat(filename, &buf) == -1)
return(0); return(0);
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
if (!(buf.st_mode & _S_IFREG)) if (!(buf.st_mode & _S_IFREG))
return(0); return(0);
#else #else

6
testHTML.c
View File

@ -627,7 +627,7 @@ parseSAXFile(char *filename) {
if (push) { if (push) {
FILE *f; FILE *f;
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
f = fopen(filename, "rb"); f = fopen(filename, "rb");
#else #else
f = fopen(filename, "r"); f = fopen(filename, "r");
@ -657,7 +657,7 @@ parseSAXFile(char *filename) {
fclose(f); fclose(f);
} }
if (!noout) { if (!noout) {
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
f = fopen(filename, "rb"); f = fopen(filename, "rb");
#else #else
f = fopen(filename, "r"); f = fopen(filename, "r");
@ -721,7 +721,7 @@ parseAndPrintFile(char *filename) {
if (push) { if (push) {
FILE *f; FILE *f;
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
f = fopen(filename, "rb"); f = fopen(filename, "rb");
#else #else
f = fopen(filename, "r"); f = fopen(filename, "r");

4
testSAX.c
View File

@ -1012,7 +1012,7 @@ parseAndPrintFile(char *filename) {
/* /*
* Empty callbacks for checking * Empty callbacks for checking
*/ */
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
f = fopen(filename, "rb"); f = fopen(filename, "rb");
#else #else
f = fopen(filename, "r"); f = fopen(filename, "r");
@ -1041,7 +1041,7 @@ parseAndPrintFile(char *filename) {
/* /*
* Debug callback * Debug callback
*/ */
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
f = fopen(filename, "rb"); f = fopen(filename, "rb");
#else #else
f = fopen(filename, "r"); f = fopen(filename, "r");

2
testlimits.c
View File

@ -13,7 +13,7 @@
#include "libxml.h" #include "libxml.h"
#include <stdio.h> #include <stdio.h>
#if !defined(_WIN32) || defined(__CYGWIN__) #if !defined(_WIN32)
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <string.h> #include <string.h>

6
testrecurse.c
View File

@ -13,7 +13,7 @@
#include "libxml.h" #include "libxml.h"
#include <stdio.h> #include <stdio.h>
#if !defined(_WIN32) || defined(__CYGWIN__) #if !defined(_WIN32)
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <string.h> #include <string.h>
@ -56,7 +56,7 @@ struct testDesc {
static int checkTestFile(const char *filename); static int checkTestFile(const char *filename);
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
#include <windows.h> #include <windows.h>
#include <io.h> #include <io.h>
@ -643,7 +643,7 @@ static int checkTestFile(const char *filename) {
if (stat(filename, &buf) == -1) if (stat(filename, &buf) == -1)
return(0); return(0);
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
if (!(buf.st_mode & _S_IFREG)) if (!(buf.st_mode & _S_IFREG))
return(0); return(0);
#else #else

6
uri.c
View File

@ -2383,7 +2383,7 @@ xmlCanonicPath(const xmlChar *path)
* For Windows implementations, additional work needs to be done to * For Windows implementations, additional work needs to be done to
* replace backslashes in pathnames with "forward slashes" * replace backslashes in pathnames with "forward slashes"
*/ */
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
int len = 0; int len = 0;
char *p = NULL; char *p = NULL;
#endif #endif
@ -2455,7 +2455,7 @@ xmlCanonicPath(const xmlChar *path)
path_processing: path_processing:
/* For Windows implementations, replace backslashes with 'forward slashes' */ /* For Windows implementations, replace backslashes with 'forward slashes' */
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
/* /*
* Create a URI structure * Create a URI structure
*/ */
@ -2534,7 +2534,7 @@ xmlPathToURI(const xmlChar *path)
cal = xmlCanonicPath(path); cal = xmlCanonicPath(path);
if (cal == NULL) if (cal == NULL)
return(NULL); return(NULL);
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
/* xmlCanonicPath can return an URI on Windows (is that the intended behaviour?) /* xmlCanonicPath can return an URI on Windows (is that the intended behaviour?)
If 'cal' is a valid URI already then we are done here, as continuing would make If 'cal' is a valid URI already then we are done here, as continuing would make
it invalid. */ it invalid. */

42
xmlIO.c
View File

@ -40,7 +40,7 @@
#include <lzma.h> #include <lzma.h>
#endif #endif
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif #endif
@ -190,7 +190,7 @@ static const char *IOerr[] = {
"unknown address family", /* EAFNOSUPPORT */ "unknown address family", /* EAFNOSUPPORT */
}; };
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
/** /**
* __xmlIOWin32UTF8ToWChar: * __xmlIOWin32UTF8ToWChar:
* @u8String: uft-8 string * @u8String: uft-8 string
@ -595,7 +595,7 @@ xmlPopOutputCallbacks(void)
* * * *
************************************************************************/ ************************************************************************/
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
/** /**
* xmlWrapOpenUtf8: * xmlWrapOpenUtf8:
@ -696,7 +696,7 @@ int
xmlCheckFilename (const char *path) xmlCheckFilename (const char *path)
{ {
#ifdef HAVE_STAT #ifdef HAVE_STAT
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
struct _stat stat_buffer; struct _stat stat_buffer;
#else #else
struct stat stat_buffer; struct stat stat_buffer;
@ -706,7 +706,7 @@ xmlCheckFilename (const char *path)
return(0); return(0);
#ifdef HAVE_STAT #ifdef HAVE_STAT
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
/* /*
* On Windows stat and wstat do not work with long pathname, * On Windows stat and wstat do not work with long pathname,
* which start with '\\?\' * which start with '\\?\'
@ -837,20 +837,20 @@ xmlFileOpen_real (const char *filename) {
} }
if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file://localhost/", 17)) { if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file://localhost/", 17)) {
#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__) #if defined (_WIN32) || defined (__DJGPP__)
path = &filename[17]; path = &filename[17];
#else #else
path = &filename[16]; path = &filename[16];
#endif #endif
} else if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file:///", 8)) { } else if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file:///", 8)) {
#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__) #if defined (_WIN32) || defined (__DJGPP__)
path = &filename[8]; path = &filename[8];
#else #else
path = &filename[7]; path = &filename[7];
#endif #endif
} else if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file:/", 6)) { } else if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file:/", 6)) {
/* lots of generators seems to lazy to read RFC 1738 */ /* lots of generators seems to lazy to read RFC 1738 */
#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__) #if defined (_WIN32) || defined (__DJGPP__)
path = &filename[6]; path = &filename[6];
#else #else
path = &filename[5]; path = &filename[5];
@ -863,7 +863,7 @@ xmlFileOpen_real (const char *filename) {
return(NULL); return(NULL);
#endif #endif
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
fd = xmlWrapOpenUtf8(path, 0); fd = xmlWrapOpenUtf8(path, 0);
#else #else
fd = fopen(path, "r"); fd = fopen(path, "r");
@ -919,13 +919,13 @@ xmlFileOpenW (const char *filename) {
} }
if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file://localhost/", 17)) if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file://localhost/", 17))
#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__) #if defined (_WIN32) || defined (__DJGPP__)
path = &filename[17]; path = &filename[17];
#else #else
path = &filename[16]; path = &filename[16];
#endif #endif
else if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file:///", 8)) { else if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file:///", 8)) {
#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__) #if defined (_WIN32) || defined (__DJGPP__)
path = &filename[8]; path = &filename[8];
#else #else
path = &filename[7]; path = &filename[7];
@ -936,7 +936,7 @@ xmlFileOpenW (const char *filename) {
if (path == NULL) if (path == NULL)
return(NULL); return(NULL);
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
fd = xmlWrapOpenUtf8(path, 1); fd = xmlWrapOpenUtf8(path, 1);
#elif(__MVS__) #elif(__MVS__)
fd = fopen(path, "w"); fd = fopen(path, "w");
@ -1109,13 +1109,13 @@ xmlGzfileOpen_real (const char *filename) {
} }
if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file://localhost/", 17)) if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file://localhost/", 17))
#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__) #if defined (_WIN32) || defined (__DJGPP__)
path = &filename[17]; path = &filename[17];
#else #else
path = &filename[16]; path = &filename[16];
#endif #endif
else if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file:///", 8)) { else if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file:///", 8)) {
#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__) #if defined (_WIN32) || defined (__DJGPP__)
path = &filename[8]; path = &filename[8];
#else #else
path = &filename[7]; path = &filename[7];
@ -1128,7 +1128,7 @@ xmlGzfileOpen_real (const char *filename) {
if (!xmlCheckFilename(path)) if (!xmlCheckFilename(path))
return(NULL); return(NULL);
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
fd = xmlWrapGzOpenUtf8(path, "rb"); fd = xmlWrapGzOpenUtf8(path, "rb");
#else #else
fd = gzopen(path, "rb"); fd = gzopen(path, "rb");
@ -1188,13 +1188,13 @@ xmlGzfileOpenW (const char *filename, int compression) {
} }
if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file://localhost/", 17)) if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file://localhost/", 17))
#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__) #if defined (_WIN32) || defined (__DJGPP__)
path = &filename[17]; path = &filename[17];
#else #else
path = &filename[16]; path = &filename[16];
#endif #endif
else if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file:///", 8)) { else if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "file:///", 8)) {
#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__) #if defined (_WIN32) || defined (__DJGPP__)
path = &filename[8]; path = &filename[8];
#else #else
path = &filename[7]; path = &filename[7];
@ -1205,7 +1205,7 @@ xmlGzfileOpenW (const char *filename, int compression) {
if (path == NULL) if (path == NULL)
return(NULL); return(NULL);
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
fd = xmlWrapGzOpenUtf8(path, mode); fd = xmlWrapGzOpenUtf8(path, mode);
#else #else
fd = gzopen(path, mode); fd = gzopen(path, mode);
@ -3774,7 +3774,7 @@ xmlParserGetDirectory(const char *filename) {
if (filename == NULL) return(NULL); if (filename == NULL) return(NULL);
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
# define IS_XMLPGD_SEP(ch) ((ch=='/')||(ch=='\\')) # define IS_XMLPGD_SEP(ch) ((ch=='/')||(ch=='\\'))
#else #else
# define IS_XMLPGD_SEP(ch) (ch=='/') # define IS_XMLPGD_SEP(ch) (ch=='/')
@ -3891,13 +3891,13 @@ static int xmlNoNetExists(const char *URL) {
return(0); return(0);
if (!xmlStrncasecmp(BAD_CAST URL, BAD_CAST "file://localhost/", 17)) if (!xmlStrncasecmp(BAD_CAST URL, BAD_CAST "file://localhost/", 17))
#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__) #if defined (_WIN32) || defined (__DJGPP__)
path = &URL[17]; path = &URL[17];
#else #else
path = &URL[16]; path = &URL[16];
#endif #endif
else if (!xmlStrncasecmp(BAD_CAST URL, BAD_CAST "file:///", 8)) { else if (!xmlStrncasecmp(BAD_CAST URL, BAD_CAST "file:///", 8)) {
#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__) #if defined (_WIN32) || defined (__DJGPP__)
path = &URL[8]; path = &URL[8];
#else #else
path = &URL[7]; path = &URL[7];

6
xmllint.c
View File

@ -2202,7 +2202,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
if ((filename[0] == '-') && (filename[1] == 0)) { if ((filename[0] == '-') && (filename[1] == 0)) {
f = stdin; f = stdin;
} else { } else {
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
f = fopen(filename, "rb"); f = fopen(filename, "rb");
#elif defined(__OS400__) #elif defined(__OS400__)
f = fopen(filename, "rb"); f = fopen(filename, "rb");
@ -2278,7 +2278,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
if ((filename[0] == '-') && (filename[1] == 0)) { if ((filename[0] == '-') && (filename[1] == 0)) {
f = stdin; f = stdin;
} else { } else {
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
f = fopen(filename, "rb"); f = fopen(filename, "rb");
#elif defined(__OS400__) #elif defined(__OS400__)
f = fopen(filename, "rb"); f = fopen(filename, "rb");
@ -2327,7 +2327,7 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
} else { } else {
FILE *f; FILE *f;
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) #if defined(_WIN32) || defined (__DJGPP__)
f = fopen(filename, "rb"); f = fopen(filename, "rb");
#elif defined(__OS400__) #elif defined(__OS400__)
f = fopen(filename, "rb"); f = fopen(filename, "rb");

2
xmlmodule.c
View File

@ -301,7 +301,7 @@ xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)
#endif /* HAVE_SHLLOAD */ #endif /* HAVE_SHLLOAD */
#endif /* ! HAVE_DLOPEN */ #endif /* ! HAVE_DLOPEN */
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>