diff src/p2_definitions.h @ 285:cd2320cd6f9a

NEW unit tests for gas volumes...
author jdg@air
date Fri, 29 May 2015 01:25:45 +0200
parents 11d4fc797f74
children 778b59f39529
line wrap: on
line diff
--- a/src/p2_definitions.h	Thu May 28 09:56:15 2015 +0200
+++ b/src/p2_definitions.h	Fri May 29 01:25:45 2015 +0200
@@ -23,7 +23,6 @@
 // history:
 // 2010-12-25 v110: [jDG] split in three files (deco.c, main.c, definitions.h)
 
-
 #define	MBAR_REACH_GASCHANGE_AUTO_CHANGE_OFF	150
 
 // *************************
@@ -48,7 +47,7 @@
 // **         Allow compile on VisualC          **
 // ***********************************************
 
-#ifdef WIN32
+#if defined(WIN32) || defined(UNIX)
     // Some keywords just dont exists on Visual C++:
 #   define CROSS_COMPILE
 #   define __18CXX
@@ -57,10 +56,7 @@
 #   define overlay
 #   define PARAMETER
 
-#include <assert.h>
-
-    // Avoid warnings about float/double mismatches:
-#   pragma warning(disable: 4244 4068 4305)
+#   include <assert.h>
 #else
 #   define PARAMETER static
 #   ifdef __DEBUG