mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 09:21:49 +08:00
25 lines
962 B
Diff
25 lines
962 B
Diff
|
diff --git a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h
|
||
|
|
index 384e7bac8..cde079401 100644
|
||
|
|
--- a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h
|
||
|
|
+++ b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h
|
||
|
|
@@ -137,15 +137,15 @@
|
||
|
|
#if defined(_M_X64) && defined(WIN32) && defined(WIN64)
|
||
|
|
// 23 August 2007 Dale Lear
|
||
|
|
|
||
|
|
-#if defined(_INC_WINDOWS)
|
||
|
|
+//#if defined(_INC_WINDOWS)
|
||
|
|
// The user has included Microsoft's windows.h before opennurbs.h,
|
||
|
|
// and windows.h has nested includes that unconditionally define WIN32.
|
||
|
|
// Just undo the damage here or everybody that includes opennurbs.h after
|
||
|
|
// windows.h has to fight with this Microsoft bug.
|
||
|
|
#undef WIN32
|
||
|
|
-#else
|
||
|
|
-#error do not define WIN32 for x64 builds
|
||
|
|
-#endif
|
||
|
|
+//#else
|
||
|
|
+//#error do not define WIN32 for x64 builds
|
||
|
|
+//#endif
|
||
|
|
|
||
|
|
// NOTE _WIN32 is defined for any type of Windows build
|
||
|
|
#endif
|