diff options
Diffstat (limited to 'redist')
-rw-r--r-- | redist/linmath.h | 2 | ||||
-rw-r--r-- | redist/mpfit/mpfit.h | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/redist/linmath.h b/redist/linmath.h index 29db5a9..e46bbd4 100644 --- a/redist/linmath.h +++ b/redist/linmath.h @@ -7,11 +7,13 @@ extern "C" { #endif +#ifndef LINMATH_EXPORT #ifdef _WIN32 #define LINMATH_EXPORT extern __declspec(dllexport) #else #define LINMATH_EXPORT __attribute__((visibility("default"))) #endif +#endif // Yes, I know it's kind of arbitrary. #define DEFAULT_EPSILON 0.001 diff --git a/redist/mpfit/mpfit.h b/redist/mpfit/mpfit.h index 67bf635..6a39ff1 100644 --- a/redist/mpfit/mpfit.h +++ b/redist/mpfit/mpfit.h @@ -88,9 +88,9 @@ struct mp_config_struct { 1 = yes, user scale values in diag; 0 = no, variables scaled internally (Default) */ int nofinitecheck; /* Disable check for infinite quantities from user? - 0 = do not perform check (Default) - 1 = perform check - */ + 0 = do not perform check (Default) + 1 = perform check + */ mp_iterproc iterproc; /* Placeholder pointer - must set to 0 */ }; @@ -108,11 +108,11 @@ struct mp_result_struct { int nfunc; /* Number of residuals (= num. of data points) */ double *resid; /* Final residuals - nfunc-vector, or 0 if not desired */ + nfunc-vector, or 0 if not desired */ double *xerror; /* Final parameter uncertainties (1-sigma) npar-vector, or 0 if not desired */ double *covar; /* Final parameter covariance matrix - npar x npar array, or 0 if not desired */ + npar x npar array, or 0 if not desired */ char version[20]; /* MPFIT version string */ }; |