Fixes for mingw build and general build

Signed-off-by: Couch, Kelly J <[email protected]>
intel · Jan 22, 2018 · 8e015a9 · 8e015a9
1 parent 23e47ba
commit 8e015a9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/invm-frameworks b/invm-frameworks
diff --git a/src/common/common_types.h b/src/common/common_types.h
@@ -36,7 +36,7 @@
 #include <limits.h>
 #include "export_common.h"
 
-#ifdef __WINDOWS__
+#ifdef __MSVC__
 #include <stdlib.h>
 #define PATH_MAX _MAX_PATH
 #endif

diff --git a/src/lib/nvm_types.h b/src/lib/nvm_types.h
@@ -35,7 +35,7 @@
 #include <stddef.h>
 #include <limits.h>
 
-#ifdef _WIN32 
+#ifdef __MSVC__
 #include <stdlib.h>
 #define PATH_MAX _MAX_PATH
 #endif

diff --git a/src/lib/win_leg_adapter_shared.h b/src/lib/win_leg_adapter_shared.h
@@ -34,9 +34,11 @@
 #define	SRC_LIB_WIN_ADAPTER_H_
 
 #include <windows.h>
-#include <winioctl.h>
 #include <PrivateIoctlDefinitions.h>
 #include <device_fw.h>
+#ifdef __MSVC__
+#include <winioctl.h>
+#endif
 
 // SCSI port used as IOCTL target
 extern short g_scsi_port;

diff --git a/src/lib/win_scm2_adapter.c b/src/lib/win_scm2_adapter.c
@@ -40,6 +40,7 @@
 #include <Setupapi.h>
 #include <GuidDef.h>
 #include <Devpkey.h>
+#include <devpropdef.h>
 #include <objbase.h>
 
 #define INITGUID
+1 −21		CMakeLists.txt
+6 −43		install/linux/rel-release/invm-frameworks.spec
+9 −0		invm-cim/CMakeLists.txt
+9 −0		invm-cli/CMakeLists.txt
+11 −3		invm-i18n/CMakeLists.txt
+2 −2		invm-i18n/src/posix_system.c