Index: trunk/psLib/src/astro/psTime.h
===================================================================
--- trunk/psLib/src/astro/psTime.h	(revision 4293)
+++ trunk/psLib/src/astro/psTime.h	(revision 4330)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 00:10:59 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-21 03:01:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -127,9 +127,9 @@
  *  in UTC format, then it is converted.
  *
- *  @return  psF64: LST Time.
- */
-psF64 psTimeToLMST(
-    psTime *time,                       ///< psTime to be converted.
-    psF64 longitude                    ///< Longitude.
+ *  @return  double: LST Time.
+ */
+double psTimeToLMST(
+    psTime *time,                      ///< psTime to be converted.
+    double longitude                    ///< Longitude.
 );
 
@@ -138,7 +138,7 @@
  *  This function is necessary to for various SLALIB functions.
  *
- *  @return  psF64: Time difference.
- */
-psF64 psTimeGetUT1Delta(
+ *  @return  double: Time difference.
+ */
+double psTimeGetUT1Delta(
     const psTime *time,                 ///< psTime to be looked up.
     psTimeBulletin bulletin             ///< IERS bulletin to use
@@ -169,9 +169,9 @@
  *  Calculates the number of leapseconds between two times.
  *
- *  @return  psS64: leapseconds added between given times
- */
-psS64 psTimeLeapSecondDelta(
-    const psTime* time1,                ///< First input time.
-    const psTime* time2                 ///< Second input time.
+ *  @return  long: leapseconds added between given times
+ */
+long psTimeLeapSecondDelta(
+    const psTime* time1,               ///< First input time.
+    const psTime* time2                ///< Second input time.
 );
 
@@ -180,7 +180,7 @@
  *  Determines if the specified UTC time is a valid leapsecond.
  *
- *  @return  psBool: valid leap second
- */
-psBool psTimeIsLeapSecond(
+ *  @return  bool: valid leap second
+ */
+bool psTimeIsLeapSecond(
     const psTime* utc                  ///< UTC to verify if leap second
 );
@@ -191,8 +191,8 @@
  *  subtract leapseconds.
  *
- *  @return  psF64: Julian Date (JD) time.
- */
-psF64 psTimeToJD(
-    const psTime* time                  ///< Input time to be converted.
+ *  @return  double: Julian Date (JD) time.
+ */
+double psTimeToJD(
+    const psTime* time                 ///< Input time to be converted.
 );
 /** Convert psTime to modified Julian date time.
@@ -201,7 +201,7 @@
  *  add or subtract leapseconds.
  *
- *  @return  psF64: Modified Julian Days (MJD) time.
- */
-psF64 psTimeToMJD(
+ *  @return  double: Modified Julian Days (MJD) time.
+ */
+double psTimeToMJD(
     const psTime* time                  ///< Input time to be converted.
 );
@@ -248,5 +248,5 @@
  */
 psTime* psTimeFromJD(
-    psF64 time                       ///< Input time to be converted.
+    double jd                          ///< Input time to be converted.
 );
 
@@ -258,5 +258,5 @@
  */
 psTime* psTimeFromMJD(
-    psF64 time                      ///< Input time to be converted.
+    double mjd                         ///< Input time to be converted.
 );
 
@@ -268,5 +268,5 @@
  */
 psTime* psTimeFromISO(
-    const char* time                 ///< Input time to be converted.
+    const char* time                   ///< Input time to be converted.
 );
 
@@ -278,5 +278,5 @@
  */
 psTime* psTimeFromTimeval(
-    const struct timeval *time       ///< Input time to be converted.
+    const struct timeval *time         ///< Input time to be converted.
 );
 
@@ -288,6 +288,6 @@
  */
 psTime* psTimeFromTT(
-    psS64 sec,                      ///< Input terrestrial time in seconds
-    psU32 nsec                      ///< Input terrestrial time fraction of seconds (nanoseconds)
+    psS64 sec,                         ///< Input terrestrial time in seconds
+    psU32 nsec                         ///< Input terrestrial time fraction of seconds (nanoseconds)
 );
 
@@ -299,7 +299,7 @@
  */
 psTime* psTimeFromUTC(
-    psS64  sec,                    ///< Input time in seconds
-    psU32  nsec,                   ///< Input time fraction of seconds (nanoseconds)
-    psBool leapsecond              ///< Input time is a leapsecond
+    psS64  sec,                        ///< Input time in seconds
+    psU32  nsec,                       ///< Input time fraction of seconds (nanoseconds)
+    bool leapsecond                    ///< Input time is a leapsecond
 );
 
@@ -313,5 +313,5 @@
  */
 psTime* p_psTimeFromTM(
-    const struct tm *time            ///< Input time to be converted.
+    const struct tm *time              ///< Input time to be converted.
 );
 
@@ -323,6 +323,6 @@
  */
 psTime* psTimeMath(
-    const psTime *time,              ///< Time.
-    psF64 delta                      ///< Time delta.
+    const psTime *time,                ///< Time.
+    double delta                       ///< Time delta.
 );
 
@@ -331,9 +331,9 @@
  *  Determine difference between two times. Input times are converted to TAI format if necessary.
  *
- *  @return psF64: Time difference.
- */
-psF64 psTimeDelta(
-    const psTime *time1,             ///< First time.
-    const psTime *time2              ///< Second time.
+ *  @return double: Time difference.
+ */
+double psTimeDelta(
+    const psTime *time1,               ///< First time.
+    const psTime *time2                ///< Second time.
 );