try to fix windows build problem, include windows.h earlier

virtualcell · Jun 2, 2024 · 9463a31 · 9463a31
1 parent 41b9feb
commit 9463a31
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/VCell/src/DomainPDEScheduler.cpp b/VCell/src/DomainPDEScheduler.cpp
@@ -3,6 +3,7 @@
  * All rights reserved.
  */
 #ifdef WIN32
+#define _HAS_STD_BYTE 0
 #include <Windows.h>
 #else
 #include <UnixDefs.h>

diff --git a/VCell/src/EllipticVolumeEqnBuilder.cpp b/VCell/src/EllipticVolumeEqnBuilder.cpp
@@ -3,6 +3,7 @@
  * All rights reserved.
  */
 #ifdef WIN32
+#define _HAS_STD_BYTE 0
 #include <Windows.h>
 #endif
 

diff --git a/VCell/src/FiniteVolume.cpp b/VCell/src/FiniteVolume.cpp
@@ -1,3 +1,8 @@
+#if (defined(WIN32) || defined(WIN64) )
+#define _HAS_STD_BYTE 0
+#include <windows.h>
+#endif
+
 #include <iostream>
 #include <fstream>
 #include <string>

diff --git a/VCell/src/TIFFImage.cpp b/VCell/src/TIFFImage.cpp
@@ -3,6 +3,7 @@
  * All rights reserved.
  */
 #ifdef WIN32
+#define _HAS_STD_BYTE 0
 #include <Windows.h>
 #else
 #include <UnixDefs.h>

diff --git a/VCellMessaging/include/VCELL/SimulationMessaging.h b/VCellMessaging/include/VCELL/SimulationMessaging.h
@@ -1,6 +1,17 @@
 #ifndef _SIMULATIONMESSAGING_H_
 #define _SIMULATIONMESSAGING_H_
 
+#if (defined(WIN32) || defined(WIN64) )
+#define _HAS_STD_BYTE 0
+#include <windows.h>
+#else
+#include <pthread.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <memory.h>
+#endif
+
+
 #include <deque>
 #ifdef USE_MESSAGING
 #include <stdlib.h>
@@ -11,14 +22,6 @@
 #include <iostream>
 using namespace std;
 
-#if (defined(WIN32) || defined(WIN64) )
-#include <windows.h>
-#else
-#include <pthread.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <memory.h>
-#endif
 
 #ifdef USE_MESSAGING
 #if (!defined(WIN32) && !defined(WIN64) )

diff --git a/libzip-1.2.0/lib/zipwin32.h b/libzip-1.2.0/lib/zipwin32.h
@@ -36,6 +36,7 @@
 
 /* 0x0501 => Windows XP; needs to be at least this value because of GetFileSizeEx */
 #define _WIN32_WINNT 0x0501
+#define _HAS_STD_BYTE 0
 #include <windows.h>
 
 /* context for Win32 source */

diff --git a/smoldyn-2.38/source/lib/opengl2.h b/smoldyn-2.38/source/lib/opengl2.h
@@ -14,6 +14,7 @@ of the Gnu Lesser General Public License (LGPL). */
 
 #if defined(HAVE_OPENGL)							// Do NOT change the sequence of these if..elses without contacting Steve
 	#ifdef WIN32
+		#define _HAS_STD_BYTE 0
 		#include <windows.h>
 	#endif