From 9e7d327b795b30bf122fcf7ca02c20ced508737a Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Wed, 16 Jul 2014 08:40:48 -0700 Subject: [PATCH] smurf: Protect against SOFA adding missing SLA constants --- applications/smurf/smurf_par.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/applications/smurf/smurf_par.h b/applications/smurf/smurf_par.h index c10e417a519..2372eb5514a 100644 --- a/applications/smurf/smurf_par.h +++ b/applications/smurf/smurf_par.h @@ -117,13 +117,17 @@ error can not determine PI #include "sofam.h" -/* And some from slamac.h that SOFA does not define */ +/* And some from slamac.h that SOFA did not always define */ /* 180/pi: radians to degrees */ +#ifndef DR2D #define DR2D 57.295779513082320876798154814105170332405472466564 +#endif /* pi/12: hours to radians */ +#ifndef DH2R #define DH2R 0.26179938779914943653855361527329190701643078328126 +#endif /* Tidy up to prevent leakage of SLA symbols */ #undef DPI