gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 09:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

tweaks

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39433 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-03-01 11:43:36 +00:00
parent 8352d4a919
commit 276e557f9c
3 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2016-03-01 Richard Frith-Macdonald <rfm@gnu.org>
Modifications to last batch of changes in order to get the code to
build again on 32bit msys/mingw
2016-03-01 Seong Gu Lee <sgleehd@gmail.com> 2016-03-01 Seong Gu Lee <sgleehd@gmail.com>
* Headers/GNUstepBase/GSConfig.h.in: * Headers/GNUstepBase/GSConfig.h.in:

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

@ -29,21 +29,43 @@
#ifndef included_GSConfig_h #ifndef included_GSConfig_h
#define included_GSConfig_h #define included_GSConfig_h
#if defined(__WIN32__) || defined(_WIN32) || defined(__MS_WIN32__) /* Check the compiler to see if we are building on/for ms-windows.
* Whatever the compiler uses, we want a standard setting of __WIN32__
* for a windows build.
*/
#if defined(__WIN32__) \
|| defined(_WIN32) \
|| defined(__MS_WIN32__) \
|| defined(__MINGW64__)
# if !defined(__WIN32__) # if !defined(__WIN32__)
# define __WIN32__ # define __WIN32__
# endif # endif
#endif #endif
#if defined(__MINGW32__) || defined(__MINGW64__) /* Check the compiler to see if we are building on/for 64bit ms-windows.
# if !defined(__MINGW__) * Whatever the compiler uses, we want a standard setting of __WIN64__
# define __MINGW__ * to indicate 64bit AND __WIN32__ to indicate ms-windows.
*/
#if defined(__WIN64__) \
|| defined(_WIN64) \
|| defined(__MS_WIN64__) \
|| defined(__MINGW64__)
# if !defined(__WIN64__)
# define __WIN64__
# endif # endif
# if !defined(__WIN32__) # if !defined(__WIN32__)
# define __WIN32__ # define __WIN32__
# endif # endif
#endif #endif
/* Check to see if this is a MINGW build (all we currently support)
*/
#if defined(__MINGW32__) || defined(__MINGW64__)
# if !defined(__MINGW__)
# define __MINGW__
# endif
#endif
// Make sure we expose the constants that we use in ObjC++ mode // Make sure we expose the constants that we use in ObjC++ mode
#ifndef __STDC_CONSTANT_MACROS #ifndef __STDC_CONSTANT_MACROS
#define __STDC_CONSTANT_MACROS 1 #define __STDC_CONSTANT_MACROS 1

2
Source/win32/GSFileHandle.m
View file

@ -23,8 +23,8 @@
*/ */
/* mingw wants winsock2.h before windows.h */ /* mingw wants winsock2.h before windows.h */
#include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <winsock2.h>
#include "common.h" #include "common.h"