[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43299] branches/carve_booleans/extern/ carve: Carve booleans: forgot this in previous commit

[Sergey Sharybin]

Revision: 43299
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43299
Author:   nazgul
Date:     2012-01-11 15:10:05 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
Carve booleans: forgot this in previous commit

Modified Paths:
--------------
    branches/carve_booleans/extern/carve/CMakeLists.txt
    branches/carve_booleans/extern/carve/include/carve/win32.h
    branches/carve_booleans/extern/carve/lib/mesh.cpp

Modified: branches/carve_booleans/extern/carve/CMakeLists.txt
===================================================================
--- branches/carve_booleans/extern/carve/CMakeLists.txt	2012-01-11 15:04:54 UTC (rev 43298)
+++ branches/carve_booleans/extern/carve/CMakeLists.txt	2012-01-11 15:10:05 UTC (rev 43299)
@@ -158,7 +158,6 @@
 		)
 	endif()
 
-
 	list(APPEND INC
 		${BOOST_INCLUDE_DIR}
 	)

Modified: branches/carve_booleans/extern/carve/include/carve/win32.h
===================================================================
--- branches/carve_booleans/extern/carve/include/carve/win32.h	2012-01-11 15:04:54 UTC (rev 43298)
+++ branches/carve_booleans/extern/carve/include/carve/win32.h	2012-01-11 15:10:05 UTC (rev 43299)
@@ -5,10 +5,11 @@
 #pragma warning (disable : 4996)
 #pragma warning (disable : 4786)
 
-#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#if defined(_WIN32) && !defined(__MINGW32__)
+
 /* The __intXX are built-in types of the visual complier! So we don't
    need to include anything else here.
-   Thistypedefs should be in sync with types from MEM_sys_types.h */
+   This typedefs should be in sync with types from MEM_sys_types.h */
 
 typedef signed __int8  int8_t;
 typedef signed __int16 int16_t;
@@ -17,6 +18,7 @@
 typedef unsigned __int8  uint8_t;
 typedef unsigned __int16 uint16_t;
 typedef unsigned __int32 uint32_t;
+
 #endif
 
 #include <string.h>

Modified: branches/carve_booleans/extern/carve/lib/mesh.cpp
===================================================================
--- branches/carve_booleans/extern/carve/lib/mesh.cpp	2012-01-11 15:04:54 UTC (rev 43298)
+++ branches/carve_booleans/extern/carve/lib/mesh.cpp	2012-01-11 15:10:05 UTC (rev 43299)
@@ -207,7 +207,7 @@
 
 
     template<unsigned ndim>
-    Face<ndim> *Face<ndim>::closeLoop(Face<ndim>::edge_t *start) {
+    Face<ndim> *Face<ndim>::closeLoop(typename Face<ndim>::edge_t *start) {
       edge_t *e = start;
       std::vector<edge_t *> loop_edges;
       do {