Index: trunk/Ohana/src/opihi/cmd.data/extract.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/extract.c	(revision 28213)
+++ trunk/Ohana/src/opihi/cmd.data/extract.c	(revision 28241)
@@ -70,6 +70,6 @@
     if ((out[0].header.Naxis[1] != Ny) || (out[0].header.Naxis[0] != Nx)) {
       gprint (GP_ERR, "matrix sizes mis-matched\n");
-      gprint (GP_ERR, "%d x %d  vs  %lld x %lld\n", Nx, Ny, 
-	      (long long) out[0].header.Naxis[0], (long long) out[0].header.Naxis[1]);
+      gprint (GP_ERR, "%d x %d  vs  "OFF_T_FMT" x "OFF_T_FMT"\n", Nx, Ny, 
+	       out[0].header.Naxis[0],  out[0].header.Naxis[1]);
       return (FALSE);
     }
Index: trunk/Ohana/src/opihi/cmd.data/matrix.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/matrix.c	(revision 28213)
+++ trunk/Ohana/src/opihi/cmd.data/matrix.c	(revision 28241)
@@ -23,7 +23,7 @@
 
     if (bufB[0].matrix.Naxis[0] != bufC[0].matrix.Naxis[1]) {
-      gprint (GP_ERR, "size mis-match in matrices: (%lld x %lld) * (%lld x %lld)\n", 
-	      (long long) bufB[0].matrix.Naxis[0], (long long) bufB[0].matrix.Naxis[1], 
-	      (long long) bufC[0].matrix.Naxis[0], (long long) bufC[0].matrix.Naxis[1]);
+      gprint (GP_ERR, "size mis-match in matrices: ("OFF_T_FMT" x "OFF_T_FMT") * ("OFF_T_FMT" x "OFF_T_FMT")\n", 
+	       bufB[0].matrix.Naxis[0],  bufB[0].matrix.Naxis[1], 
+	       bufC[0].matrix.Naxis[0],  bufC[0].matrix.Naxis[1]);
       return (FALSE);
     }
Index: trunk/Ohana/src/opihi/cmd.data/rd.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/rd.c	(revision 28213)
+++ trunk/Ohana/src/opihi/cmd.data/rd.c	(revision 28241)
@@ -222,6 +222,6 @@
   buf[0].unsign = buf[0].header.unsign;
 
-  gprint (GP_LOG, "read %lld bytes from %s into buffer %s\n", 
-	  (long long) buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
+  gprint (GP_LOG, "read "OFF_T_FMT" bytes from %s into buffer %s\n", 
+	   buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
 
   blank = 0xffff;
Index: trunk/Ohana/src/opihi/cmd.data/rdseg.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/rdseg.c	(revision 28213)
+++ trunk/Ohana/src/opihi/cmd.data/rdseg.c	(revision 28241)
@@ -62,5 +62,5 @@
   buf[0].bzero  = buf[0].header.bzero;     /* store the original values */
   buf[0].unsign = buf[0].header.unsign;
-  gprint (GP_LOG, "read %lld bytes from %s into buffer %s\n", (long long) buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
+  gprint (GP_LOG, "read "OFF_T_FMT" bytes from %s into buffer %s\n",  buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
 
   gfits_scan (&buf[0].header, "BLANK", "%d", 1, &blank);
Index: trunk/Ohana/src/opihi/cmd.data/rebin.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/rebin.c	(revision 28213)
+++ trunk/Ohana/src/opihi/cmd.data/rebin.c	(revision 28241)
@@ -63,5 +63,5 @@
     }      
   }
-  if (VERBOSE) gprint (GP_LOG, "rebin %s to %s (%lld,%lld to %d,%d)\n", argv[1], argv[2], (long long) in[0].header.Naxis[0], (long long) in[0].header.Naxis[1], nx, ny);
+  if (VERBOSE) gprint (GP_LOG, "rebin %s to %s ("OFF_T_FMT","OFF_T_FMT" to %d,%d)\n", argv[1], argv[2],  in[0].header.Naxis[0],  in[0].header.Naxis[1], nx, ny);
 
   Nx = in[0].header.Naxis[0];
Index: trunk/Ohana/src/opihi/dvo/avextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/avextract.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/avextract.c	(revision 28241)
@@ -103,5 +103,5 @@
     catalog.Nsecfilt = 0;
 
-    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
+    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i,  skylist[0].Nregions);
       
     // an error exit status here is a significant error
Index: trunk/Ohana/src/opihi/dvo/avmatch.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/avmatch.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/avmatch.c	(revision 28241)
@@ -102,5 +102,5 @@
     catalog.Nsecfilt = 0;
 
-    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
+    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i,  skylist[0].Nregions);
       
     // an error exit status here is a significant error
Index: trunk/Ohana/src/opihi/dvo/cmatch.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/cmatch.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/cmatch.c	(revision 28241)
@@ -37,5 +37,5 @@
   }
   dvo_catalog_unlock (&catalog1);
-  gprint (GP_ERR, "read %lld stars from phot catalog file %s\n", (long long) catalog1.Naverage, filename);
+  gprint (GP_ERR, "read "OFF_T_FMT" stars from phot catalog file %s\n",  catalog1.Naverage, filename);
 
   /* this is for loading from a text file, presumably hstgsc or usno
Index: trunk/Ohana/src/opihi/dvo/cmpread.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/cmpread.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/cmpread.c	(revision 28241)
@@ -65,5 +65,5 @@
 
   /* find expected number of stars */
-  if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) {
+  if (!gfits_scan (&header, "NSTARS", OFF_T_FMT, 1,  &Nstars)) {
     gprint (GP_ERR, "ERROR: can't get NSTARS from header\n");
     gfits_free_header (&header);
@@ -77,5 +77,5 @@
     /* allocate space for stars */
     gprint (GP_ERR, "reading from TEXT cmp file %s\n", argv[2]);
-    if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) {
+    if (!gfits_scan (&header, "NSTARS", OFF_T_FMT, 1,  &Nstars)) {
       gprint (GP_ERR, "ERROR: failed to find NSTARS\n");
       exit (1);
@@ -139,5 +139,5 @@
   free (stars);
   gfits_free_header (&header);
-  gprint (GP_ERR, "loaded %lld objects\n", (long long) Nstars);
+  gprint (GP_ERR, "loaded "OFF_T_FMT" objects\n",  Nstars);
   return (TRUE);
 }
Index: trunk/Ohana/src/opihi/dvo/detrend.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/detrend.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/detrend.c	(revision 28241)
@@ -137,5 +137,5 @@
 
   /* load existing data from database */
-  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
+  gfits_scan (&header, "NIMAGES", OFF_T_FMT, 1,  &Nimage);
   ALLOCATE (pimage, RegImage, Nimage);
   status = fread (pimage, sizeof(RegImage), Nimage, f);
@@ -143,5 +143,5 @@
 
   if (status != Nimage) {
-    gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
+    gprint (GP_ERR, "ERROR: header and data in dB don't match ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nimage,  status);
     gfits_free_header (&header);
     free (pimage);
Index: trunk/Ohana/src/opihi/dvo/fitcolors.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/fitcolors.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/fitcolors.c	(revision 28241)
@@ -174,5 +174,5 @@
     // the selection criteria
   }
-  gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions);
+  gprint (GP_ERR, "using "OFF_T_FMT" possible regions\n",  skylist[0].Nregions);
 
   /* vectors to save data */
Index: trunk/Ohana/src/opihi/dvo/fitsed.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/fitsed.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/fitsed.c	(revision 28241)
@@ -185,5 +185,5 @@
   /* loop over regions, extract data for each region */
   // XXX add interrupt checks
-  gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions);
+  gprint (GP_ERR, "using "OFF_T_FMT" possible regions\n",  skylist[0].Nregions);
   for (k = 0; k < skylist[0].Nregions; k++) {
     /* lock, load, unlock catalog */
Index: trunk/Ohana/src/opihi/dvo/gstar.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/gstar.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/gstar.c	(revision 28241)
@@ -159,5 +159,5 @@
       k = N1[i];
       if (!QUIET) {
-	gprint (GP_LOG, "star: %lld\n", (long long) i);
+	gprint (GP_LOG, "star: "OFF_T_FMT"\n",  i);
 	gprint (GP_LOG, "%11.7f ", catalog.average[k].R);
 	gprint (GP_LOG, "%11.7f ", catalog.average[k].D);
Index: trunk/Ohana/src/opihi/dvo/imrough.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imrough.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/imrough.c	(revision 28241)
@@ -267,5 +267,5 @@
     
     /* load existing data from database */
-    gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
+    gfits_scan (&header, "NIMAGES", OFF_T_FMT, 1,  &Nimage);
     ALLOCATE (image, RegImage, Nimage);
     status = fread (image, sizeof(RegImage), Nimage, f);
@@ -273,5 +273,5 @@
     
     if (status != Nimage) {
-      gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %d)\n", (long long) Nimage, status);
+      gprint (GP_ERR, "ERROR: header and data in dB don't match ("OFF_T_FMT" vs %d)\n",  Nimage, status);
       gfits_free_header (&header);
       free (image);
@@ -304,5 +304,5 @@
   /* convert to internal format */
   image = (RegImage *) table.buffer;
-  gfits_scan (table.header, "NAXIS2", "%lld", 1, (long long *) &Nimage);
+  gfits_scan (table.header, "NAXIS2", OFF_T_FMT, 1,  &Nimage);
   gfits_convert_RegImage (image, sizeof (RegImage), Nimage);
 
Index: trunk/Ohana/src/opihi/dvo/imsearch.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imsearch.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/imsearch.c	(revision 28241)
@@ -106,10 +106,10 @@
 
   /* load existing data from database */
-  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
+  gfits_scan (&header, "NIMAGES", OFF_T_FMT, 1,  &Nimage);
   ALLOCATE (pimage, RegImage, Nimage);
   status = fread (pimage, sizeof(RegImage), Nimage, f);
   fclose (f);
   if (status != Nimage) {
-    gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
+    gprint (GP_ERR, "ERROR: header and data in dB don't match ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nimage,  status);
     gfits_free_header (&header);
     free (pimage);
@@ -131,5 +131,5 @@
     obstime[strlen(obstime)-1] = 0;
 
-    gprint (GP_LOG, "%5lld %6s %6s %2d %2d   ", (long long) i, get_type_name(pimage[i].type), get_mode_name(pimage[i].mode), pimage[i].ccd, pimage[i].type);
+    gprint (GP_LOG, OFF_T_FMT" %6s %6s %2d %2d   ",  i, get_type_name(pimage[i].type), get_mode_name(pimage[i].mode), pimage[i].ccd, pimage[i].type);
     gprint (GP_LOG, "%s %s  ", pimage[i].pathname, pimage[i].filename);
     gprint (GP_LOG, "%s %s %f %s\n", pimage[i].filter, pimage[i].instrument, pimage[i].exptime, obstime);
Index: trunk/Ohana/src/opihi/dvo/mextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/mextract.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/mextract.c	(revision 28241)
@@ -120,5 +120,5 @@
     catalog.Nsecfilt = Nsecfilt;
 
-    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
+    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i,  skylist[0].Nregions);
       
     // an error exit status here is a significant error
Index: trunk/Ohana/src/opihi/dvo/mmextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/mmextract.c	(revision 28213)
+++ trunk/Ohana/src/opihi/dvo/mmextract.c	(revision 28241)
@@ -186,5 +186,5 @@
     catalog.Nsecfilt = Nsecfilt;
 
-    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
+    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i,  skylist[0].Nregions);
       
     // an error exit status here is a significant error
Index: trunk/Ohana/src/opihi/pcontrol/StartHost.c
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/StartHost.c	(revision 28213)
+++ trunk/Ohana/src/opihi/pcontrol/StartHost.c	(revision 28241)
@@ -14,7 +14,6 @@
   if (VarConfig ("SHELL", "%s", shell)     == NULL) strcpy (shell, "pclient");
 
-#ifndef __APPLE__
-  if (VerboseMode()) gprint (GP_ERR, "starting host within thread %lld\n", (long long) pthread_self());
-#endif
+  if (VerboseMode()) gprint (GP_ERR, "starting host within thread\n");
+
   pid = rconnect (command, host[0].hostname, shell, stdio);
   if (!pid) {     
Index: trunk/Ohana/src/opihi/pcontrol/StopHosts.c
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/StopHosts.c	(revision 28213)
+++ trunk/Ohana/src/opihi/pcontrol/StopHosts.c	(revision 28241)
@@ -128,7 +128,5 @@
   int i, result, waitstatus;
 
-#ifndef __APPLE__
-  if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %lld\n", (long long) pthread_self());
-#endif
+  if (VerboseMode()) gprint (GP_ERR, "harvesting within thread\n");
   if (VerboseMode()) gprint (GP_ERR, "child process %d is down, wait for exit status\n", pid);