Ignore:
Timestamp:
Nov 30, 2011 2:47:15 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:
b9765ad
Parents:
890ac7f1
Message:

Re #5 fixing librefl compilation on MSVC

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/c_extensions/libmultifunc/librefl.c

    r0164899a r2138c061  
    77#include <stdio.h> 
    88#include <stdlib.h> 
    9  
     9#if defined(_MSC_VER) 
     10#include "winFuncs.h" 
     11#endif 
    1012 
    1113complex cassign(real, imag) 
     
    125127        complex b; 
    126128{ 
    127         complex neg,negb,zero,two,z,i,bi,negbi; 
     129        complex zero,two,z,i,bi,negbi; 
    128130        zero = cassign(0.0,0.0); 
    129131        two = cassign(2.0,0.0); 
     
    152154        double n_sub,nu, ind; 
    153155{ 
    154         if (nu == 0.0) 
    155                 nu = 1e-14; 
    156         if (n_sub == 0.0) 
    157                 n_sub = 1.0; 
    158  
    159         double center, func; 
     156  double center, func; 
     157  if (nu == 0.0) 
     158                nu = 1e-14; 
     159        if (n_sub == 0.0) 
     160                n_sub = 1.0; 
     161 
     162 
    160163        //ind = (n_sub-1.0)/2.0-1.0 +ind; 
    161164        center = n_sub/2.0; 
Note: See TracChangeset for help on using the changeset viewer.