Changeset 37d58372 in sasview for sansmodels/src/sans/models

Timestamp:

Nov 30, 2011 11:45:30 AM (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:

c38ea65

Parents:

59ec324

Message:

Re #5 fixing samsmodels compilation on MSVC

File:

• sansmodels/src/sans/models/libigor/libCylinder.h (modified) (1 diff)

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

@@ -6 +6 @@
 #include <windows.h>
 #define fmax max
+
+typedef union { unsigned char __c[4]; float __f; } INFINITY;
+
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  define __HUGE_VALF_bytes { 0x7f, 0x80, 0, 0 }
+# endif
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+#  define __HUGE_VALF_bytes { 0, 0, 0x80, 0x7f }
+# endif
+
+static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
+# define INFINITY  (__huge_valf.__f)
+
+
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  define __nan_bytes   { 0x7f, 0xc0, 0, 0 }
+# endif
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+#  define __nan_bytes   { 0, 0, 0xc0, 0x7f }
+# endif
+
+static union { unsigned char __c[4]; float __d; } __nan_union
+    __attribute_used__ = { __nan_bytes };
+# define NAN  (__nan_union.__d)
+
+
 #endif