sergiotarxz/libvips
sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2257 from kleisauke/cygwin-compatibility

Browse Source 
Ensure compatibility with Cygwin
This commit is contained in:
John Cupitt 2021-05-17 11:32:03 +01:00 committed by GitHub
commit fc8dbfdb44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libvips/iofuncs/source.c
View File

@ -76,13 +76,13 @@
/* Try to make an O_BINARY ... sometimes need the leading '_'. /* Try to make an O_BINARY ... sometimes need the leading '_'.
*/ */
#ifdef G_PLATFORM_WIN32 #if defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)
#ifndef O_BINARY #ifndef O_BINARY
#ifdef _O_BINARY #ifdef _O_BINARY
#define O_BINARY _O_BINARY #define O_BINARY _O_BINARY
#endif /*_O_BINARY*/ #endif /*_O_BINARY*/
#endif /*!O_BINARY*/ #endif /*!O_BINARY*/
#endif /*G_PLATFORM_WIN32*/ #endif /*defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)*/
/* If we have O_BINARY, add it to a mode flags set. /* If we have O_BINARY, add it to a mode flags set.
*/ */

4
libvips/iofuncs/target.c
View File

@ -66,13 +66,13 @@
/* Try to make an O_BINARY ... sometimes need the leading '_'. /* Try to make an O_BINARY ... sometimes need the leading '_'.
*/ */
#ifdef G_PLATFORM_WIN32 #if defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)
#ifndef O_BINARY #ifndef O_BINARY
#ifdef _O_BINARY #ifdef _O_BINARY
#define O_BINARY _O_BINARY #define O_BINARY _O_BINARY
#endif /*_O_BINARY*/ #endif /*_O_BINARY*/
#endif /*!O_BINARY*/ #endif /*!O_BINARY*/
#endif /*G_PLATFORM_WIN32*/ #endif /*defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)*/
/* If we have O_BINARY, add it to a mode flags set. /* If we have O_BINARY, add it to a mode flags set.
*/ */

16
libvips/iofuncs/util.c
View File

@ -67,13 +67,13 @@
/* Try to make an O_BINARY ... sometimes need the leading '_'. /* Try to make an O_BINARY ... sometimes need the leading '_'.
*/ */
#ifdef G_PLATFORM_WIN32 #if defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)
#ifndef O_BINARY #ifndef O_BINARY
#ifdef _O_BINARY #ifdef _O_BINARY
#define O_BINARY _O_BINARY #define O_BINARY _O_BINARY
#endif /*_O_BINARY*/ #endif /*_O_BINARY*/
#endif /*!O_BINARY*/ #endif /*!O_BINARY*/
#endif /*G_PLATFORM_WIN32*/ #endif /*defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)*/
/* If we have O_BINARY, add it to a mode flags set. /* If we have O_BINARY, add it to a mode flags set.
*/ */
@ -698,14 +698,14 @@ vips__file_open_read( const char *filename, const char *fallback_dir,
char *mode; char *mode;
FILE *fp; FILE *fp;
#ifdef G_PLATFORM_WIN32 #if defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)
if( text_mode ) if( text_mode )
mode = "r"; mode = "r";
else else
mode = "rb"; mode = "rb";
#else /*!G_PLATFORM_WIN32*/ #else /*!defined(G_PLATFORM_WIN32) && !defined(G_WITH_CYGWIN)*/
mode = "r"; mode = "r";
#endif /*G_PLATFORM_WIN32*/ #endif /*defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)*/
if( (fp = vips__fopen( filename, mode )) ) if( (fp = vips__fopen( filename, mode )) )
return( fp ); return( fp );
@ -734,14 +734,14 @@ vips__file_open_write( const char *filename, gboolean text_mode )
char *mode; char *mode;
FILE *fp; FILE *fp;
#ifdef G_PLATFORM_WIN32 #if defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)
if( text_mode ) if( text_mode )
mode = "w"; mode = "w";
else else
mode = "wb"; mode = "wb";
#else /*!G_PLATFORM_WIN32*/ #else /*!defined(G_PLATFORM_WIN32) && !defined(G_WITH_CYGWIN)*/
mode = "w"; mode = "w";
#endif /*G_PLATFORM_WIN32*/ #endif /*defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)*/
if( !(fp = vips__fopen( filename, mode )) ) { if( !(fp = vips__fopen( filename, mode )) ) {
vips_error_system( errno, "vips__file_open_write", vips_error_system( errno, "vips__file_open_write",

4
libvips/iofuncs/vips.c
View File

@ -115,13 +115,13 @@
/* Try to make an O_BINARY ... sometimes need the leading '_'. /* Try to make an O_BINARY ... sometimes need the leading '_'.
*/ */
#ifdef G_PLATFORM_WIN32 #if defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)
#ifndef O_BINARY #ifndef O_BINARY
#ifdef _O_BINARY #ifdef _O_BINARY
#define O_BINARY _O_BINARY #define O_BINARY _O_BINARY
#endif /*_O_BINARY*/ #endif /*_O_BINARY*/
#endif /*!O_BINARY*/ #endif /*!O_BINARY*/
#endif /*G_PLATFORM_WIN32*/ #endif /*defined(G_PLATFORM_WIN32) || defined(G_WITH_CYGWIN)*/
/* If we have O_BINARY, add it to a mode flags set. /* If we have O_BINARY, add it to a mode flags set.
*/ */