Changeset f54e82cf in sasview for src/sas/sascalc/calculator/c_extensions/libfunc.h

Timestamp:

Jul 31, 2018 4:36:52 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

d9b7197

Parents:

3067196

git-author:

Torin Cooper-Bennun <torin.cooper-bennun@…> (07/30/18 10:35:02)

git-committer:

Torin Cooper-Bennun <torin.cooper-bennun@…> (07/31/18 04:36:52)

Message:

Cherry-pick changes from master for tinycc compatibility (note: tinycc compilation not yet supported fully):

144e032af2 tinycc doesn't return structures, so must pass return structure as pointer
a1daf86c0d hack around broken isfinite/isnan in tinycc
7e82256ecb declare all variables at the start of the block so C89 compilers don't complain

File:

• src/sas/sascalc/calculator/c_extensions/libfunc.h (modified) (1 diff)

src/sas/sascalc/calculator/c_extensions/libfunc.h

@@ -18 +18 @@
 //double gamln(double x);
 
-polar_sld cal_msld(int isangle, double qx, double qy, double bn, double m01, double mtheta1, 
+void cal_msld(polar_sld*, int isangle, double qx, double qy, double bn, double m01, double mtheta1, 
                         double mphi1, double spinfraci, double spinfracf, double spintheta);