diff -Nurd -x'*~' sunwait-20041208.orig/main.c sunwait-20041208/main.c
--- sunwait-20041208.orig/main.c	2004-12-08 20:48:49.000000000 -0500
+++ sunwait-20041208/main.c	2008-08-16 12:56:58.000000000 -0400
@@ -5,6 +5,8 @@
 #include <stdlib.h> 
 #include <math.h>
 #include <time.h>
+#include <unistd.h>
+#include <string.h>
 
 #include "sunriset.h"
 
@@ -50,7 +52,7 @@
   { NULL, 0, 0 }
 };
 
-print_usage() 
+void print_usage() 
 {
   FILE* f = stdout;
   fprintf(f, "usage: sunwait [options] [sun|civ|naut|astr] [up|down] [+/-offset] [latitude] [longitude]\n\n");
diff -Nurd -x'*~' sunwait-20041208.orig/print.c sunwait-20041208/print.c
--- sunwait-20041208.orig/print.c	2002-09-04 10:38:32.000000000 -0400
+++ sunwait-20041208/print.c	2008-08-16 13:29:17.000000000 -0400
@@ -67,7 +67,7 @@
   if (local)
     printf( "Local time:                 %2d:%2.2d \n", tm->tm_hour, tm->tm_min);
   else
-    printf( "Zulu time (UTC):            %2d:%2.2d %s\n", 
+    printf( "Zulu time (UTC):            %2ld:%2.2d %s\n", 
 	    TMOD(tm->tm_hour - (timezone_offset/3600)), 
 	    tm->tm_min, 
 	    DAYSOFF(tm->tm_hour - (timezone_offset/3600)));
@@ -92,10 +92,10 @@
   astr = astronomical_twilight( year, month, day, lon, lat,
 				&astr_start, &astr_end );
   
-  printf( "Current specified time zone: %s (%d from UTC) \n", timezone_name, +timezone_offset/3600 );
+  printf( "Current specified time zone: %s (%ld from UTC) \n", timezone_name, +timezone_offset/3600 );
 
   if (local)
-    printf( "Sun transits meridian %2.2d%2.2d %s\n", 
+    printf( "Sun transits meridian %2.2ld%2.2d %s\n", 
 	    TMOD(HOURS((rise+set)/2.0) + timezone_offset/3600),
 	    MINUTES((rise+set)/2.0),
 	    timezone_name);
diff -Nurd -x'*~' sunwait-20041208.orig/sunriset.h sunwait-20041208/sunriset.h
--- sunwait-20041208.orig/sunriset.h	2004-01-24 05:08:58.000000000 -0500
+++ sunwait-20041208/sunriset.h	2008-08-16 13:00:38.000000000 -0400
@@ -113,3 +113,6 @@
 
 double GMST0( double d );
 
+int print_everything(int year, int month, int day, 
+		     double lat, double lon,
+		     struct tm* tm, char local);