Changeset 2138c061 in sasview

Timestamp:

Nov 30, 2011 2:47:15 PM (12 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:

b9765ad

Parents:

890ac7f1

Message:

Re #5 fixing librefl compilation on MSVC

File:

• sansmodels/src/sans/models/c_extensions/libmultifunc/librefl.c (modified) (3 diffs)

sansmodels/src/sans/models/c_extensions/libmultifunc/librefl.c

@@ -7 +7 @@
 #include <stdio.h>
 #include <stdlib.h>
-
+#if defined(_MSC_VER)
+#include "winFuncs.h"
+#endif
 
 complex cassign(real, imag)
@@ -125 +127 @@
         complex b;
 {
-        complex neg,negb,zero,two,z,i,bi,negbi;
+        complex zero,two,z,i,bi,negbi;
         zero = cassign(0.0,0.0);
         two = cassign(2.0,0.0);
@@ -152 +154 @@
         double n_sub,nu, ind;
 {
-        if (nu == 0.0)
-                nu = 1e-14;
-        if (n_sub == 0.0)
-                n_sub = 1.0;
-
-        double center, func;
+  double center, func;
+  if (nu == 0.0)
+                nu = 1e-14;
+        if (n_sub == 0.0)
+                n_sub = 1.0;
+
+
         //ind = (n_sub-1.0)/2.0-1.0 +ind;
         center = n_sub/2.0;