aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2005-11-14 23:00:35 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2005-11-14 23:00:35 +0000
commit1720b31fa810489b72b2e87768edb7b72d749973 (patch)
treebdbc20d3848d6fb1140de027b3bab9c7e58e0841
parent05d103a032c52a0de8e8f2af2be067198cd1b5eb (diff)
these pragmas are only used for MSVC, not MinGW or Cygwin, therefore changing the define from NT to _MSC_VER
svn path=/trunk/externals/zexy/; revision=3904
-rw-r--r--src/zexy.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/zexy.h b/src/zexy.h
index a45c3ba..fc599ef 100644
--- a/src/zexy.h
+++ b/src/zexy.h
@@ -31,8 +31,12 @@
#define INCLUDE_ZEXY_H__
#ifdef __WIN32__
-# define NT
-# define MSW
+# ifndef NT
+# define NT
+# endif
+# ifndef MSW
+# define MSW
+# endif
#endif
#include "m_pd.h"
@@ -40,11 +44,14 @@
#define VERSION "2.1"
-
-#ifdef __WIN32__
+/* these pragmas are only used for MSVC, not MinGW or Cygwin */
+#ifdef _MSC_VER
# pragma warning( disable : 4018 )
# pragma warning( disable : 4244 )
# pragma warning( disable : 4305 )
+#endif
+
+#ifdef __WIN32__
# define HEARTSYMBOL 3
# define STATIC_INLINE
# define sqrtf sqrt