Changeset 12004 for issm/branches/trunk-jpl-damage/src/c/objects/Params/IntParam.h

Timestamp:

04/16/12 16:06:52 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 11990

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/objects/Params/IntParam.h (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/c/objects/Params/IntParam.h

@@ -15 +15 @@
 #endif
 
-#ifdef _SERIAL_
+#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
 #include <mex.h>
 #endif
@@ -82 +82 @@
 
                 void GetParameterName(char**pname);
-                #ifdef _SERIAL_
+                #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
                 void  SetMatlabField(mxArray* dataref);
                 #endif