Index: trunk/psLib/src/astronomy/slalib.h
===================================================================
--- trunk/psLib/src/astronomy/slalib.h	(revision 3127)
+++ trunk/psLib/src/astronomy/slalib.h	(revision 3139)
@@ -7,6 +7,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-12 21:10:41 $
+*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-05 08:33:20 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,82 +16,6 @@
 #define SLALIB_H
 
-#ifdef FORTRAN_UNDERSCORE_PREFIX
-#ifdef FORTRAN_DOUBLE_UNDERSCORE_SUFFIX
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa _SLA_AOPPA__
-#define fslaAopqk _SLA_AOPQK__
-#define fslaOapqk _SLA_OAPQK__
-#define fslaAirmas _SLA_AIRMAS__
-#else
-#define fslaAoppa _sla_aoppa__
-#define fslaAopqk _sla_aopqk__
-#define fslaOapqk _sla_oapqk__
-#define fslaAirmas _sla_airmas__
-#endif
-#elif FORTRAN_NO_UNDERSCORE_SUFFIX
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa _SLA_AOPPA
-#define fslaAopqk _SLA_AOPQK
-#define fslaOapqk _SLA_OAPQK
-#define fslaAirmas _SLA_AIRMAS
-#else
-#define fslaAoppa _sla_aoppa
-#define fslaAopqk _sla_aopqk
-#define fslaOapqk _sla_oapqk
-#define fslaAirmas _sla_airmas
-#endif
-#else
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa _SLA_AOPPA_
-#define fslaAopqk _SLA_AOPQK_
-#define fslaOapqk _SLA_OAPQK_
-#define fslaAirmas _SLA_AIRMAS_
-#else
-#define fslaAoppa _sla_aoppa_
-#define fslaAopqk _sla_aopqk_
-#define fslaOapqk _sla_oapqk_
-#define fslaAirmas _sla_airmas_
-#endif
-#endif
-#else
-#ifdef FORTRAN_DOUBLE_UNDERSCORE_SUFFIX
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa SLA_AOPPA__
-#define fslaAopqk SLA_AOPQK__
-#define fslaOapqk SLA_OAPQK__
-#define fslaAirmas SLA_AIRMAS__
-#else
-#define fslaAoppa sla_aoppa__
-#define fslaAopqk sla_aopqk__
-#define fslaOapqk sla_oapqk__
-#define fslaAirmas sla_airmas__
-#endif
-#elif FORTRAN_NO_UNDERSCORE_SUFFIX
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa SLA_AOPPA
-#define fslaAopqk SLA_AOPQK
-#define fslaOapqk SLA_OAPQK
-#define fslaAirmas SLA_AIRMAS
-#else
-#define fslaAoppa sla_aoppa
-#define fslaAopqk sla_aopqk
-#define fslaOapqk sla_oapqk
-#define fslaAirmas sla_airmas
-#endif
-#else
-#ifdef FORTRAN_UPPERCASE
-#define fslaAoppa SLA_AOPPA_
-#define fslaAopqk SLA_AOPQK_
-#define fslaOapqk SLA_OAPQK_
-#define fslaAirmas SLA_AIRMAS_
-#else
-#define fslaAoppa sla_aoppa_
-#define fslaAopqk sla_aopqk_
-#define fslaOapqk sla_oapqk_
-#define fslaAirmas sla_airmas_
-#endif
-#endif
-#endif
 
+#define fslaAoppa F77_FUNC(sla_aoppa,SLA_AOPPA)
 extern void fslaAoppa(
         const double* date,
@@ -110,4 +34,5 @@
     );
 
+#define fslaAopqk F77_FUNC(sla_aopqk,SLA_AOPQK)
 extern void fslaAopqk(
         const double* RAP,
@@ -121,4 +46,5 @@
     );
 
+#define fslaOapqk F77_FUNC(sla_oapqk,SLA_OAPQK)
 extern void fslaOapqk(
         char* TYPE,
@@ -130,4 +56,5 @@
     );
 
+#define fslaAirmas F77_FUNC(sla_airmas,SLA_AIRMAS)
 extern double fslaAirmas(
         const double* zenithDistance