Changeset 2c63e80e in sasview

Timestamp:

Nov 30, 2011 4:52:24 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:

2c041e9

Parents:

92ffdb6

Message:

Re #5 fixing samsmodels compilation on MSVC

Files:

• sansmodels/src/sans/models/c_extensions/schulz.c (modified) (1 diff)
• sansmodels/src/sans/models/c_models/gamma_win.c (added)
• sansmodels/src/sans/models/c_models/gamma_win.cpp (deleted)
• sansmodels/src/sans/models/c_models/gamma_win.h (modified) (1 diff)
• setup.py (modified) (1 diff)

sansmodels/src/sans/models/c_extensions/schulz.c

@@ -10 +10 @@
 #include "gamma_win.h"
 #endif
-
 
 /**

sansmodels/src/sans/models/c_models/gamma_win.h

@@ -5 +5 @@
 
 // Note that the functions Gamma and LogGamma are mutually dependent.
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 double lgamma(double);
 double gamma(double);
 
+#ifdef __cplusplus
+}
 #endif
 
+#endif
+

setup.py

@@ -135 +135 @@
 
 if not os.name=='nt':
-    IGNORED_FILES.extend(["gamma_win.cpp","winFuncs.c"])
+    IGNORED_FILES.extend(["gamma_win.c","winFuncs.c"])