Index: trunk/Ohana/src/addstar/src/LoadStars.c
===================================================================
--- trunk/Ohana/src/addstar/src/LoadStars.c	(revision 14401)
+++ trunk/Ohana/src/addstar/src/LoadStars.c	(revision 14590)
@@ -97,5 +97,5 @@
   } else {
     double jd;
-    jd = sec_to_jd (image[0].tzero);
+    jd = ohana_sec_to_jd (image[0].tzero);
     image[0].sidtime  = ohana_lst (jd, Longitude);
   }
Index: trunk/Ohana/src/addstar/src/ReadImageHeader.c
===================================================================
--- trunk/Ohana/src/addstar/src/ReadImageHeader.c	(revision 14401)
+++ trunk/Ohana/src/addstar/src/ReadImageHeader.c	(revision 14590)
@@ -126,5 +126,5 @@
   } else {
     double jd;
-    jd = sec_to_jd (image[0].tzero);
+    jd = ohana_sec_to_jd (image[0].tzero);
     image[0].sidtime  = ohana_lst (jd, Longitude);
   }
Index: trunk/Ohana/src/addstar/src/args.c
===================================================================
--- trunk/Ohana/src/addstar/src/args.c	(revision 14401)
+++ trunk/Ohana/src/addstar/src/args.c	(revision 14590)
@@ -91,5 +91,5 @@
     time_t tmp;
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tmp)) { 
+    if (!ohana_str_to_time (argv[N], &tmp)) { 
       fprintf (stderr, "syntax error in time\n");
       exit (1);
Index: trunk/Ohana/src/addstar/src/args_client.c
===================================================================
--- trunk/Ohana/src/addstar/src/args_client.c	(revision 14401)
+++ trunk/Ohana/src/addstar/src/args_client.c	(revision 14590)
@@ -54,5 +54,5 @@
     time_t tmp;
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tmp)) { 
+    if (!ohana_str_to_time (argv[N], &tmp)) { 
       fprintf (stderr, "syntax error in time\n");
       exit (1);
Index: trunk/Ohana/src/addstar/src/calibrate.c
===================================================================
--- trunk/Ohana/src/addstar/src/calibrate.c	(revision 14401)
+++ trunk/Ohana/src/addstar/src/calibrate.c	(revision 14590)
@@ -127,5 +127,5 @@
       SaveCalibration (Mcal, new[0].dM, CalM0, dCalM, Minst, Nstar);
       if ((DUMP != NULL) && !strcmp (DUMP, "cal")) {
-	fprintf (stdout, "cal-match : %10.6f %10.6f : %7.4f %6.4f  %7.4f %6.4f   %7.4f : %7.4f %7.4f\n", average[0].R, average[0].D, Mcal, new[0].dM, CalM0, dCalM, Minst, airmass, color);
+	fprintf (stdout, "cal-match : %10.6f %10.6f : %7.4f %6.4f  %7.4f %6.4f   %7.4f : %7.4f %7.4f\n", average[0].R, average[0].D, Mcal, new[0].dM, CalM0, dCalM, Minst, new[0].airmass, color);
       }
       return;
Index: trunk/Ohana/src/addstar/src/get2mass_ops.c
===================================================================
--- trunk/Ohana/src/addstar/src/get2mass_ops.c	(revision 14401)
+++ trunk/Ohana/src/addstar/src/get2mass_ops.c	(revision 14590)
@@ -148,5 +148,5 @@
   if (end == NULL) Shutdown ("format error in 2mass");
   *end = 0;
-  time = date_to_sec (ptr);
+  time = ohana_date_to_sec (ptr);
   *end = '|';
 
@@ -167,5 +167,5 @@
   *end = 0;
   jd = strtod (p, NULL);
-  time = jd_to_sec (jd);
+  time = ohana_jd_to_sec (jd);
   *end = '|';
 
Index: trunk/Ohana/src/addstar/src/gettycho.c
===================================================================
--- trunk/Ohana/src/addstar/src/gettycho.c	(revision 14401)
+++ trunk/Ohana/src/addstar/src/gettycho.c	(revision 14590)
@@ -53,5 +53,5 @@
   ALLOCATE (buffer, char, NITEM*NBYTE);
 
-  TychoEpoch = date_to_sec ("1991/04/02,07:30:00");
+  TychoEpoch = ohana_date_to_sec ("1991/04/02,07:30:00");
 
   for (i = 0; i < skylist[0].Nregions; i++) {
Index: trunk/Ohana/src/addstar/src/getusnob.c
===================================================================
--- trunk/Ohana/src/addstar/src/getusnob.c	(revision 14401)
+++ trunk/Ohana/src/addstar/src/getusnob.c	(revision 14590)
@@ -108,5 +108,5 @@
     }
 
-    USNOepoch = date_to_sec ("2000/01/01,00:00:00");
+    USNOepoch = ohana_date_to_sec ("2000/01/01,00:00:00");
 
     buf = buffer;