Index: trunk/Ohana/src/skycalc/src/astro.c
===================================================================
--- trunk/Ohana/src/skycalc/src/astro.c	(revision 19841)
+++ trunk/Ohana/src/skycalc/src/astro.c	(revision 20936)
@@ -106,5 +106,5 @@
 
   double incl;
-  double xpr,ypr,zpr;
+  double ypr,zpr;
   double T;
 
@@ -141,5 +141,4 @@
 double SC_etcorr (double jd) {
 
-  double jd1900 = 2415019.5;
   double dates[20] = {1900,1905,1910,1915,1920,1925,1930,1935,1940,1945,
 		      1950,1955,1960,1965,1970,1975,1980,1985,1990,1993};
Index: trunk/Ohana/src/skycalc/src/dusktime.c
===================================================================
--- trunk/Ohana/src/skycalc/src/dusktime.c	(revision 19841)
+++ trunk/Ohana/src/skycalc/src/dusktime.c	(revision 20936)
@@ -13,5 +13,5 @@
 }
 
-main (int argc, char **argv) {
+int main (int argc, char **argv) {
 
   struct SC_date_time date, tmpdate;
@@ -59,5 +59,5 @@
 
   if (VERBOSE) {
-    jd_to_date (jdnow, &tmpdate);
+    SC_jd_to_date (jdnow, &tmpdate);
     fprintf (stderr, "%4d/%02d/%02d %02d:%02d:%02f\n", tmpdate.y, tmpdate.mo, tmpdate.d, tmpdate.h, tmpdate.mn, tmpdate.s);
   }
Index: trunk/Ohana/src/skycalc/src/geometry.c
===================================================================
--- trunk/Ohana/src/skycalc/src/geometry.c	(revision 19841)
+++ trunk/Ohana/src/skycalc/src/geometry.c	(revision 20936)
@@ -8,5 +8,4 @@
    double mod;    /* modulus */
    double xy;     /* component in xy plane */
-   short sign;    /* for determining quadrant */
    double radian_ra, radian_dec;
 
Index: trunk/Ohana/src/skycalc/src/moon.c
===================================================================
--- trunk/Ohana/src/skycalc/src/moon.c	(revision 19841)
+++ trunk/Ohana/src/skycalc/src/moon.c	(revision 20936)
@@ -368,7 +368,6 @@
   double geora, geodec, geodist;  /* geocent for moon, not used here.*/
   double ramoon, decmoon, distmoon;
-  double hamoonrise, hamoonset, tmoonrise, tmoonset, jdmoonrise, jdmoonset;
-  short dow; /* day of week */
-  struct SC_date_time date_midnight, tmpdate;
+  double hamoonset, tmoonset, jdmoonset;
+  struct SC_date_time date_midnight;
   double dt, lst0, lst1, djd, horiz;
 
@@ -420,7 +419,6 @@
   double geora, geodec, geodist;  /* geocent for moon, not used here.*/
   double ramoon, decmoon, distmoon;
-  double hamoonrise, hamoonset, tmoonrise, tmoonset, jdmoonrise, jdmoonset;
-  short dow; /* day of week */
-  struct SC_date_time date_midnight, tmpdate;
+  double hamoonset, tmoonrise, jdmoonrise;
+  struct SC_date_time date_midnight;
   double dt, lst0, lst1, djd, horiz;
 
Index: trunk/Ohana/src/skycalc/src/moondata.c
===================================================================
--- trunk/Ohana/src/skycalc/src/moondata.c	(revision 19841)
+++ trunk/Ohana/src/skycalc/src/moondata.c	(revision 20936)
@@ -12,7 +12,7 @@
 }
 
-main (int argc, char **argv) {
+int main (int argc, char **argv) {
 
-  struct SC_date_time date, tmpdate;
+  struct SC_date_time date;
   double longit, lat, elevsea, elev;
   double jdnow, ra, dec, sid;
Index: trunk/Ohana/src/skycalc/src/sun.c
===================================================================
--- trunk/Ohana/src/skycalc/src/sun.c	(revision 19841)
+++ trunk/Ohana/src/skycalc/src/sun.c	(revision 20936)
@@ -5,5 +5,5 @@
 void SC_lpsun (double jd, double *ra, double *dec) {
 
-  double n, L, g, lambda,epsilon,alpha,delta,x,y,z;
+  double n, L, g, lambda,epsilon,x,y,z;
 
   n = jd - J2000;
@@ -54,14 +54,13 @@
 }
 
-/* Given site position, prints Sun info for the given night.
+/* Given site position, prints Sun info for the given night. */
 /* dates are all in UT now */
 double SC_sunset_tonight (struct SC_date_time date, double lat, double longit, double elev) {
 
   double jd, jdmid0, jdmid, stmid;
-  double rasun, decsun, min_alt, max_alt, horiz;
-  double hasunset, jdsunset, jdsunrise, sid;
+  double rasun, decsun, horiz;
+  double hasunset, jdsunset;
   double dt, lst0, lst1, djd;
-  struct SC_date_time date_midnight, tmpdate;
-  short dow;
+  struct SC_date_time date_midnight;
 
   horiz = sqrt (2. * elev / 6378140.) * DEG_IN_RADIAN;
@@ -106,14 +105,13 @@
 }
 
-/* Given site position, prints Sun info for the given night.
+/* Given site position, prints Sun info for the given night. */
 /* dates are all in UT now */
 double SC_sunrise_tonight (struct SC_date_time date, double lat, double longit, double elev) {
 
   double jd, jdmid, stmid;
-  double rasun, decsun, min_alt, max_alt, horiz;
-  double hasunset, jdsunset, jdsunrise, sid;
+  double rasun, decsun, horiz;
+  double hasunset, jdsunrise;
   double dt, lst0, lst1, djd;
-  struct SC_date_time date_midnight, tmpdate;
-  short dow;
+  struct SC_date_time date_midnight;
 
   horiz = sqrt (2. * elev / 6378140.) * DEG_IN_RADIAN;
Index: trunk/Ohana/src/skycalc/src/sundata.c
===================================================================
--- trunk/Ohana/src/skycalc/src/sundata.c	(revision 19841)
+++ trunk/Ohana/src/skycalc/src/sundata.c	(revision 20936)
@@ -12,12 +12,11 @@
 }
 
-main (int argc, char **argv) {
+int main (int argc, char **argv) {
 
-  struct SC_date_time date, tmpdate;
+  struct SC_date_time date;
   double longit, lat, elevsea, elev;
-  double jdnow, ra, dec, sid, alt, az, sind, sinh, cosh;
-  double geora, geodec, geodist, dist;
+  double jdnow, sid, alt, az, sind, sinh, cosh;
   double RAo, DECo, abx, aby, abz, cs, theta;
-  double Rsun, Dsun, days, Hsun;
+  double Rsun, Dsun, Hsun;
   time_t tzero;
   struct tm *stm;
Index: trunk/Ohana/src/skycalc/src/sunmoon.c
===================================================================
--- trunk/Ohana/src/skycalc/src/sunmoon.c	(revision 19841)
+++ trunk/Ohana/src/skycalc/src/sunmoon.c	(revision 20936)
@@ -9,8 +9,8 @@
 double angular_separation (double ra, double dec, double RA, double DEC);
 
-main (int argc, char **argv) {
+int main (int argc, char **argv) {
 
   int N;
-  struct SC_date_time date, tmpdate;
+  struct SC_date_time date;
   double longitude, latitude, elevation;
   double jdnow, sid;
Index: trunk/Ohana/src/skycalc/src/time.c
===================================================================
--- trunk/Ohana/src/skycalc/src/time.c	(revision 19841)
+++ trunk/Ohana/src/skycalc/src/time.c	(revision 20936)
@@ -6,6 +6,4 @@
   time_t t;
   struct tm *stm;
-  double jd, jdb, jde;
-  short dow;
   
   t = time (0);
@@ -109,5 +107,5 @@
 double SC_lst (double jd, double longit) {
   
-  double t, ut, jdmid, jdint, jdfrac, sid_g, sid;
+  double t, ut, jdmid, jdint, jdfrac, sid_g;
   long sid_int;