Merge pull request #594 from codinghipster/master

Fix linux (fedora) compilation issues
Aloshi · Aug 26, 2018 · 9cc42ad · 9cc42ad
2 parents d24c0cc + 49ccd8f
commit 9cc42ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/es-core/src/Util.cpp b/es-core/src/Util.cpp
@@ -26,7 +26,7 @@ std::string strToUpper(const std::string& str)
 }
 
 
-#if _MSC_VER < 1800
+#if defined(_WIN32) && _MSC_VER < 1800
 float round(float num)
 {
 	return (float)((int)(num + 0.5f));

diff --git a/es-core/src/Util.h b/es-core/src/Util.h
@@ -15,7 +15,9 @@ Eigen::Affine3f roundMatrix(const Eigen::Affine3f& mat);
 Eigen::Vector3f roundVector(const Eigen::Vector3f& vec);
 Eigen::Vector2f roundVector(const Eigen::Vector2f& vec);
 
+#if defined(_WIN32) && _MSC_VER < 1800
 float round(float num);
+#endif
 
 std::string getCanonicalPath(const std::string& str);