Changeset 6a2c931 in sasview


Ignore:
Timestamp:
Nov 30, 2011 2:28:17 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:
e161fac
Parents:
6e24633
Message:

Re #5 fixing samsmodels compilation on MSVC

Location:
sansmodels/src/sans/models/libigor
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/src/sans/models/libigor/libCylinder.h

    r50ac11d r6a2c931  
    33*/ 
    44#if defined(_MSC_VER) 
    5 #define NOMINMAX 
    6 #include <windows.h> 
    7 #define fmax max 
    8  
    9 typedef union { unsigned char __c[4]; float __f; } __huge_valf_t; 
    10  
    11 # if __BYTE_ORDER == __BIG_ENDIAN 
    12 #  define __HUGE_VALF_bytes { 0x7f, 0x80, 0, 0 } 
    13 # endif 
    14 # if __BYTE_ORDER == __LITTLE_ENDIAN 
    15 #  define __HUGE_VALF_bytes { 0, 0, 0x80, 0x7f } 
    16 # endif 
    17  
    18 static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes }; 
    19 # define INFINITY  (__huge_valf.__f) 
    20  
    21  
    22 # if __BYTE_ORDER == __BIG_ENDIAN 
    23 #  define __nan_bytes   { 0x7f, 0xc0, 0, 0 } 
    24 # endif 
    25 # if __BYTE_ORDER == __LITTLE_ENDIAN 
    26 #  define __nan_bytes   { 0, 0, 0xc0, 0x7f } 
    27 # endif 
    28  
    29 static union { unsigned char __c[4]; float __d; } __nan_union; 
    30 # define NAN  (__nan_union.__d) 
    31  
    32  
     5#include "winFuncs.h" 
    336#endif 
    347 

  • sansmodels/src/sans/models/libigor/libSphere.h

    r34c2649 r6a2c931  
    11// header for SphereFit.c 
     2#if defined(_MSC_VER) 
     3#include "winFuncs.h" 
     4#endif 
    25 
    36/* IGOR Fit Functions */ 

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

    r3a084629 r6a2c931  
    2020//long double erfcl(long double x); 
    2121//float erfcf(float x; 
     22 
     23 
     24// Define INFINITY and NAN 
     25typedef union { unsigned char __c[4]; float __f; } __huge_valf_t; 
     26 
     27# if __BYTE_ORDER == __BIG_ENDIAN 
     28#  define __HUGE_VALF_bytes { 0x7f, 0x80, 0, 0 } 
     29# endif 
     30# if __BYTE_ORDER == __LITTLE_ENDIAN 
     31#  define __HUGE_VALF_bytes { 0, 0, 0x80, 0x7f } 
     32# endif 
     33 
     34static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes }; 
     35# define INFINITY  (__huge_valf.__f) 
     36 
     37 
     38# if __BYTE_ORDER == __BIG_ENDIAN 
     39#  define __nan_bytes   { 0x7f, 0xc0, 0, 0 } 
     40# endif 
     41# if __BYTE_ORDER == __LITTLE_ENDIAN 
     42#  define __nan_bytes   { 0, 0, 0xc0, 0x7f } 
     43# endif 
     44 
     45static union { unsigned char __c[4]; float __d; } __nan_union; 
     46# define NAN  (__nan_union.__d) 
     47 
Note: See TracChangeset for help on using the changeset viewer.