/[escript]/trunk/escript/src/system_dep.h
ViewVC logotype

Diff of /trunk/escript/src/system_dep.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 743 by woo409, Sat Jun 24 11:44:55 2006 UTC revision 744 by woo409, Sat Jun 24 12:05:12 2006 UTC
# Line 11  Line 11 
11    
12  #ifdef _WIN32  #ifdef _WIN32
13    
14  #ifdef __INTEL_COMPILER  # ifdef __INTEL_COMPILER
15  // The Intel compiler on windows has an "improved" math library compared to the usual Visual C++ one  // The Intel compiler on windows has an "improved" math library compared to the usual Visual C++ one
16  // In particular it has a acosh and other similar functions which aren't implemented in Visual C++ math.h  // In particular it has a acosh and other similar functions which aren't implemented in Visual C++ math.h
17  // Note you will get a compile time error if any other header (including system ones) includes math.h whilst mathimf.h  // Note you will get a compile time error if any other header (including system ones) includes math.h whilst mathimf.h
18  // has been included. As a result system_dep.h must be included FIRST at all times (this prevents math.h from being included).  // has been included. As a result system_dep.h must be included FIRST at all times (this prevents math.h from being included).
19  #include <mathimf.h>  #  include <mathimf.h>
20  #else  # else
21  #include <math.h>  #  include <math.h>
22  #endif  # endif
23    
24  #ifndef INTERFACE_STATIC_LIB  #ifndef INTERFACE_STATIC_LIB
25  #ifdef ESCRIPT_EXPORTS  # ifdef ESCRIPT_EXPORTS
26  #define ESCRIPT_DLL_API __declspec(dllexport)  #   define ESCRIPT_DLL_API __declspec(dllexport)
27  #else  #  else
28  #define ESCRIPT_DLL_API __declspec(dllimport)  #   define ESCRIPT_DLL_API __declspec(dllimport)
29  #endif  # endif
 #else  
 #define ESCRIPT_DLL_API  
30  #endif  #endif
31    
32    #else
33    # define ESCRIPT_DLL_API
34  #endif  #endif
35    
36  #endif  #endif

Legend:
Removed from v.743  
changed lines
  Added in v.744

  ViewVC Help
Powered by ViewVC 1.1.26