comparison code_part1/OSTC_code_c_part2/p2_definitions.h @ 711:f555590f1419

minor cleanups for CNS/NOAA bugfix.
author JeanDo <jd.gascuel@free.fr>
date Thu, 09 May 2013 00:26:41 +0200
parents d1719622111e
children 8466932a2fcf
comparison
equal deleted inserted replaced
710:d36f060e8203 711:f555590f1419
46 46
47 #define DBS_mode 0x0001 47 #define DBS_mode 0x0001
48 #define DBS_ppO2 0x0002 48 #define DBS_ppO2 0x0002
49 #define DBS_HE_sat 0x0004 49 #define DBS_HE_sat 0x0004
50 // #define DBS_UNUSED 0x0008 50 // #define DBS_UNUSED 0x0008
51 51
52 #define DBS_SAT2l 0x0010 52 #define DBS_SAT2l 0x0010
53 #define DBS_SAT2h 0x0020 53 #define DBS_SAT2h 0x0020
54 #define DBS_GFLOW2l 0x0040 54 #define DBS_GFLOW2l 0x0040
55 #define DBS_GFLOW2h 0x0080 55 #define DBS_GFLOW2h 0x0080
56 56
57 #define DBS_GFHGH2l 0x0100 57 #define DBS_GFHGH2l 0x0100
58 #define DBS_GFHGH2h 0x0200 58 #define DBS_GFHGH2h 0x0200
59 #define DBS_GASO22l 0x0400 59 #define DBS_GASO22l 0x0400
60 #define DBS_GASO22h 0x0800 60 #define DBS_GASO22h 0x0800
61 61
62 #define DBS_DIST2h 0x1000 62 #define DBS_DIST2h 0x1000
63 #define DBS_LAST2h 0x2000 63 #define DBS_LAST2h 0x2000
64 #define DBS_DECOO2l 0x4000 64 #define DBS_DECOO2l 0x4000
65 #define DBS_DECOO2h 0x8000 65 #define DBS_DECOO2h 0x8000
66 66
67 #define DBS2_PRES2h 0x0001 67 #define DBS2_PRES2h 0x0001
68 #define DBS2_PRES2l 0x0002 68 #define DBS2_PRES2l 0x0002
69 #define DBS2_SURF2l 0x0004 69 #define DBS2_SURF2l 0x0004
70 #define DBS2_SURF2h 0x0008 70 #define DBS2_SURF2h 0x0008
71 71
72 #define DBS2_DESAT2l 0x0010 72 #define DBS2_DESAT2l 0x0010
73 #define DBS2_DESAT2h 0x0020 73 #define DBS2_DESAT2h 0x0020
74 #define DBS2_GFDneg 0x0040 74 #define DBS2_GFDneg 0x0040
75 75
76 */ 76 */
100 100
101 // *********************************************** 101 // ***********************************************
102 // ** Allow compile on VisualC ** 102 // ** Allow compile on VisualC **
103 // *********************************************** 103 // ***********************************************
104 104
105 #if defined(WIN32) || defined(UNIX) 105 #if defined(WIN32) || defined(UNIX)
106 // Some keywords just dont exists on Visual C++: 106 // Some keywords just dont exists on Visual C++:
107 # define CROSS_COMPILE 107 # define CROSS_COMPILE
108 # define __18CXX 108 # define __18CXX
109 # define ram 109 # define ram
110 # define rom 110 # define rom
114 # include <assert.h> 114 # include <assert.h>
115 115
116 // Avoid warnings about float/double mismatches: 116 // Avoid warnings about float/double mismatches:
117 # ifdef WIN32 117 # ifdef WIN32
118 # pragma warning(disable: 4244 4068 4305) 118 # pragma warning(disable: 4244 4068 4305)
119 # elif defined(Q_OS_MAC)
120 //# pragma GCC diagnostic error "-Wunknown-pragmas"
121 # pragma GCC diagnostic error "-Wunused-variable"
122 # endif 119 # endif
123 #else 120 #else
124 # define PARAMETER static 121 # define PARAMETER static
125 # ifdef __DEBUG 122 # ifdef __DEBUG
126 # define assert(predicate) if( !(predicate) ) assert_failed(__LINE__) 123 # define assert(predicate) if( !(predicate) ) assert_failed(__LINE__)