Revision: 65314
http://sourceforge.net/p/brlcad/code/65314
Author: starseeker
Date: 2015-06-16 00:54:25 +0000 (Tue, 16 Jun 2015)
Log Message:
-----------
Add mingw fixes from
http://cmrg.ucsd.edu/Continuity/Documentation/DeveloperDocs/OpenNurbs
Modified Paths:
--------------
brlcad/trunk/src/other/openNURBS/opennurbs_system.h
brlcad/trunk/src/other/openNURBS/opennurbs_uuid.h
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_system.h
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_system.h 2015-06-16 00:29:13 UTC
(rev 65313)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_system.h 2015-06-16 00:54:25 UTC
(rev 65314)
@@ -141,6 +141,10 @@
// to explicitly exclude inclusion of windows.h.
*/
+#if defined(__MINGW32__)
+# define ON_NO_WINDOWS
+#endif
+
#if !defined(ON_NO_WINDOWS)
/*
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_uuid.h
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_uuid.h 2015-06-16 00:29:13 UTC
(rev 65313)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_uuid.h 2015-06-16 00:54:25 UTC
(rev 65314)
@@ -18,9 +18,9 @@
#define OPENNURBS_UUID_INC_
// ON_UUID is a 16 byte universally unique identifier
-#if defined(UUID_DEFINED)
+#if defined(UUID_DEFINED) && !defined(ON_COMPILER_GNU)
typedef UUID ON_UUID;
-#elif defined(GUID_DEFINED)
+#elif defined(GUID_DEFINED) && !defined(ON_COMPILER_GNU)
typedef GUID ON_UUID;
#else
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
