Author: rfm
Date: Tue Mar 1 11:41:33 2016
New Revision: 39432
URL: http://svn.gna.org/viewcvs/gnustep?rev=39432&view=rev
Log:
tweaks for win64 by Seong Gu Lee <[email protected]>
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in
libs/base/trunk/Headers/GNUstepBase/GSTypeEncoding.h
libs/base/trunk/Source/GSFileHandle.h
libs/base/trunk/Source/win32/GSFileHandle.m
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=39432&r1=39431&r2=39432&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Tue Mar 1 11:41:33 2016
@@ -1,3 +1,11 @@
+2016-03-01 Seong Gu Lee <[email protected]>
+
+ * Headers/GNUstepBase/GSConfig.h.in:
+ * Headers/GNUstepBase/GSTypeEncoding.h:
+ * Source/GSFileHandle.h:
+ * Source/win32/GSFileHandle.m:
+ Tweaks for WIN64 build
+
2016-02-29 Richard Frith-Macdonald <[email protected]>
* configure.ac:
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=39432&r1=39431&r2=39432&view=diff
==============================================================================
--- libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in (original)
+++ libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in Tue Mar 1 11:41:33 2016
@@ -28,6 +28,21 @@
#ifndef included_GSConfig_h
#define included_GSConfig_h
+
+#if defined(__WIN32__) || defined(_WIN32) || defined(__MS_WIN32__)
+# if !defined(__WIN32__)
+# define __WIN32__
+# endif
+#endif
+
+#if defined(__MINGW32__) || defined(__MINGW64__)
+# if !defined(__MINGW__)
+# define __MINGW__
+# endif
+# if !defined(__WIN32__)
+# define __WIN32__
+# endif
+#endif
// Make sure we expose the constants that we use in ObjC++ mode
#ifndef __STDC_CONSTANT_MACROS
@@ -220,10 +235,11 @@
/*
* Native character type for use in systemcalls etc.
*/
+
#if defined(__MINGW__)
-#define GSNativeChar uint16_t
-#else
-#define GSNativeChar char
+# define GSNativeChar uint16_t
+#else
+# define GSNativeChar char
#endif
/*
@@ -251,21 +267,6 @@
#define GS_USE_LIBDISPATCH @HAVE_LIBDISPATCH@
#define GS_HAVE_OBJC_ROOT_CLASS_ATTR @GS_HAVE_OBJC_ROOT_CLASS_ATTR@
-#if defined(__WIN32__) || defined(_WIN32) || defined(__MS_WIN32__)
-# if !defined(__WIN32__)
-# define __WIN32__
-# endif
-#endif
-
-#if defined(__MINGW32__)
-# if !defined(__MINGW__)
-# define __MINGW__
-# endif
-# if !defined(__WIN32__)
-# define __WIN32__
-# endif
-#endif
-
#ifndef __has_include
# define __has_include(x) 0
#endif
@@ -299,13 +300,17 @@
#undef WINVER
#define WINVER Windows2000
#endif
+
+/* mingw wants winsock2.h before windows.h */
+#include <winsock2.h>
#include <windows.h>
#undef BOOL
#endif
-// Include the blocks runtime header if it's available (It shouldn't matter
-// that this doesn't work on compilers that don't support __has_include(),
-// because they also don't support blocks).
+/* Include the blocks runtime header if it's available (It shouldn't matter
+ * that this doesn't work on compilers that don't support __has_include(),
+ * because they also don't support blocks).
+ */
#if __has_include(<objc/block_runtime.h>)
# include <objc/block_runtime.h>
#endif
Modified: libs/base/trunk/Headers/GNUstepBase/GSTypeEncoding.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Headers/GNUstepBase/GSTypeEncoding.h?rev=39432&r1=39431&r2=39432&view=diff
==============================================================================
--- libs/base/trunk/Headers/GNUstepBase/GSTypeEncoding.h (original)
+++ libs/base/trunk/Headers/GNUstepBase/GSTypeEncoding.h Tue Mar 1
11:41:33 2016
@@ -28,6 +28,12 @@
#define GS_TYPE_ENCODING_H
#include <GNUstepBase/GSVersionMacros.h>
+
+#if defined(__MINGW__)
+/* On MINGW we need to get the boolean type from the runtime at this point.
+ */
+#define _NO_BOOL_TYPEDEF
+#endif
#if defined (NeXT_RUNTIME)
# include <objc/objc-runtime.h>
Modified: libs/base/trunk/Source/GSFileHandle.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/GSFileHandle.h?rev=39432&r1=39431&r2=39432&view=diff
==============================================================================
--- libs/base/trunk/Source/GSFileHandle.h (original)
+++ libs/base/trunk/Source/GSFileHandle.h Tue Mar 1 11:41:33 2016
@@ -105,7 +105,9 @@
type: (RunLoopEventType)type
extra: (void*)extra
forMode: (NSString*)mode;
+
- (void) setAddr: (struct sockaddr *)sin;
+
- (BOOL) useCompression;
- (void) watchReadDescriptorForModes: (NSArray*)modes;
- (void) watchWriteDescriptor;
Modified: libs/base/trunk/Source/win32/GSFileHandle.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/win32/GSFileHandle.m?rev=39432&r1=39431&r2=39432&view=diff
==============================================================================
--- libs/base/trunk/Source/win32/GSFileHandle.m (original)
+++ libs/base/trunk/Source/win32/GSFileHandle.m Tue Mar 1 11:41:33 2016
@@ -22,8 +22,9 @@
Boston, MA 02111 USA.
*/
+/* mingw wants winsock2.h before windows.h */
+#include <winsock2.h>
#include <windows.h>
-#include <winsock2.h>
#include "common.h"
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
