gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #142 from gnustep/msys-fix

Browse source 
Msys fix
This commit is contained in:
rfm 2020-06-06 11:11:06 +01:00 committed by GitHub
commit e2d223b564
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Headers/GNUstepBase/GSConfig.h.in
View file

@ -306,8 +306,18 @@ typedef struct {
#define WINVER Windows2000
#endif
// Trick to distinguish between MSYS/MinGW and MSYS2/MinGW32, the latter defines
// __MINGW32_MAJOR_VERSION and __MINGW32_MINOR_VERSION for compatibility
// but to a lower version than older MSYS/MinGW, but not the compound version
//
#if defined(__MINGW32_VERSION)
#define __USE_W32_SOCKETS
#include <windows.h>
#include <winsock2.h>
#else
#include <winsock2.h>
#include <windows.h>
#endif
#undef __OBJC_BOOL
#undef BOOL

3
Source/win32/GSFileHandle.m
View file

@ -22,9 +22,6 @@
Boston, MA 02111 USA.
*/
#include <winsock2.h>
#include <windows.h>
#include "common.h"
#define EXPOSE_NSFileHandle_IVARS 1
#define EXPOSE_GSFileHandle_IVARS 1