Author: rfm
Date: Tue Mar 1 12:43:36 2016
New Revision: 39433
URL: http://svn.gna.org/viewcvs/gnustep?rev=39433&view=rev
Log:
tweaks
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in
libs/base/trunk/Source/win32/GSFileHandle.m
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=39433&r1=39432&r2=39433&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Tue Mar 1 12:43:36 2016
@@ -1,3 +1,8 @@
+2016-03-01 Richard Frith-Macdonald <[email protected]>
+
+ 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 <[email protected]>
* Headers/GNUstepBase/GSConfig.h.in:
Modified: libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in?rev=39433&r1=39432&r2=39433&view=diff
==============================================================================
--- libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in (original)
+++ libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in Tue Mar 1 12:43:36 2016
@@ -29,18 +29,40 @@
#ifndef 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__)
# define __WIN32__
# endif
#endif
+/* Check the compiler to see if we are building on/for 64bit ms-windows.
+ * Whatever the compiler uses, we want a standard setting of __WIN64__
+ * 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
+# if !defined(__WIN32__)
+# define __WIN32__
+# 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
-# if !defined(__WIN32__)
-# define __WIN32__
# endif
#endif
Modified: libs/base/trunk/Source/win32/GSFileHandle.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/win32/GSFileHandle.m?rev=39433&r1=39432&r2=39433&view=diff
==============================================================================
--- libs/base/trunk/Source/win32/GSFileHandle.m (original)
+++ libs/base/trunk/Source/win32/GSFileHandle.m Tue Mar 1 12:43:36 2016
@@ -23,8 +23,8 @@
*/
/* mingw wants winsock2.h before windows.h */
+#include <windows.h>
#include <winsock2.h>
-#include <windows.h>
#include "common.h"
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
