merged 2.6 branch changes back into trunk using : svn merge -r 8699:8706 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.6 .

2008-08-03 16:57:09 +00:00
parent ced418ccb5
commit f81ff952a2
7 changed files with 116 additions and 24 deletions
--- a/src/OpenThreads/win32/Win32ConditionPrivateData.h
+++ b/src/OpenThreads/win32/Win32ConditionPrivateData.h
@@ -21,6 +21,7 @@

 #ifndef _WINDOWS_
 #define WIN32_LEAN_AND_MEAN
+#define _WIN32_WINNT 0x0400
 #include <windows.h>
 #endif

--- a/src/OpenThreads/win32/Win32Thread.cpp
+++ b/src/OpenThreads/win32/Win32Thread.cpp
@@ -19,6 +19,7 @@
 #include <string>
 #include <iostream>
 #include <process.h>
+#include <stdlib.h>

 #if defined(_MSC_VER) && (_MSC_VER < 1300)
 #ifdef __SGI_STL