Changeset 11995 for issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.h

Timestamp:

04/16/12 14:57:18 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11994M

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src/c/objects/ExternalResults/DoubleMatExternalResult.h (modified) (2 diffs)

issm/trunk ¶

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.h ¶

@@ -15 +15 @@
 #endif
 
-#ifdef _SERIAL_
+#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
 #include <mex.h>
 #endif
@@ -61 +61 @@
                 void  WriteData(FILE* fid,bool io_gather);
                 void  GetResultName(char**);
-                #ifdef _SERIAL_
+                #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
                 void  SetMatlabField(mxArray* dataref);
                 #endif

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in