Changeset b23b722 in sasview

Timestamp:

Nov 30, 2011 5:15:27 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

61cce73

Parents:

3be94e8

Message:

Re #5 fixing samsmodels compilation on MSVC

Location:

sansmodels/src/sans/models

Files:

• c_smearer/smearer.cpp (modified) (1 diff)
• libigor/winFuncs.h (modified) (2 diffs)

sansmodels/src/sans/models/c_smearer/smearer.cpp

@@ -17 +17 @@
 using namespace std;
 
-
+#if defined(_MSC_VER)
+#include "winFuncs.h"
+#endif
 /**
  * Constructor for BaseSmearer

sansmodels/src/sans/models/libigor/winFuncs.h

@@ -5 +5 @@
    Andrew Jackson, October 2007
    */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 double fmax(double x, double y);
@@ -23 +27 @@
 //float erfcf(float x;
 
+#ifdef __cplusplus
+}
+#endif
 
 // Define INFINITY and NAN