Index: branches/eam_branches/ipp-20101103/Ohana/src/libdvo/include/dvo.h
===================================================================
--- branches/eam_branches/ipp-20101103/Ohana/src/libdvo/include/dvo.h	(revision 29819)
+++ branches/eam_branches/ipp-20101103/Ohana/src/libdvo/include/dvo.h	(revision 29820)
@@ -58,10 +58,10 @@
 // these are used as NAN for types of int values
 typedef enum {
-    NAN_S_CHAR  = 0x7f,
-    NAN_U_CHAR  = 0xff,   // was NO_ERR
-    NAN_S_SHORT = 0x7fff, // was NO_MAG
-    NAN_U_SHORT = 0xffff, 
-    NAN_S_INT   = 0x7fffffff,
-    NAN_U_INT   = 0xffffffff,
+  NAN_S_CHAR  = 0x7f,
+  NAN_U_CHAR  = 0xff,   // was NO_ERR
+  NAN_S_SHORT = 0x7fff, // was NO_MAG
+  NAN_U_SHORT = 0xffff, 
+  NAN_S_INT   = 0x7fffffff,
+  NAN_U_INT   = 0xffffffff,
 } DVO_INT_NAN;
 
@@ -135,17 +135,17 @@
 /* Average.code values -- these values are 32 bit (as of PS1_V1) */
 typedef enum {
-  ID_STAR_FEW     = 0x00000001, // used within relphot: skip star 
-  ID_STAR_POOR    = 0x00000002, // used within relphot: skip star 
-  ID_PROPER       = 0x00000400, // star with large proper motion 
-  ID_TRANSIENT    = 0x00001000, // is this mutually exclusive with USNO?  
-  ID_VARIABLE     = 0x00002000, // not currently set? 
-  ID_ASTEROID     = 0x00002000, // identified with an asteroid 
-  ID_BAD_OBJECT   = 0x00004000, // if all measurements are bad, set this bit 
+  ID_STAR_FEW     = 0x00000001, // used within relphot: skip star
+  ID_STAR_POOR    = 0x00000002, // used within relphot: skip star
+  ID_PROPER       = 0x00000400, // star with large proper motion
+  ID_TRANSIENT    = 0x00001000, // is this mutually exclusive with USNO?
+  ID_VARIABLE     = 0x00002000, // not currently set?
+  ID_ASTEROID     = 0x00002000, // identified with an asteroid
+  ID_BAD_OBJECT   = 0x00004000, // if all measurements are bad, set this bit
   ID_MOVING       = 0x00008000, // is a moving object
-  ID_ROCK         = 0x0000a000, // 0x8000 + 0x2000 
-  ID_GHOST        = 0x0000c001, // 0x8000 + 0x4000 + 0x0001 
-  ID_TRAIL        = 0x0000c002, // 0x8000 + 0x4000 + 0x0002 
-  ID_BLEED        = 0x0000c003, // 0x8000 + 0x4000 + 0x0003  
-  ID_COSMIC       = 0x0000c004, // 0x8000 + 0x4000 + 0x0004  
+  ID_ROCK         = 0x0000a000, // 0x8000 + 0x2000
+  ID_GHOST        = 0x0000c001, // 0x8000 + 0x4000 + 0x0001
+  ID_TRAIL        = 0x0000c002, // 0x8000 + 0x4000 + 0x0002
+  ID_BLEED        = 0x0000c003, // 0x8000 + 0x4000 + 0x0003
+  ID_COSMIC       = 0x0000c004, // 0x8000 + 0x4000 + 0x0004
   ID_STAR_FIT_AVE = 0x00010000, // average position fitted
   ID_STAR_FIT_PM  = 0x00020000, // proper motion fitted
@@ -156,6 +156,6 @@
   ID_OBJ_EXT      = 0x01000000, // extended in our data (eg, PS)
   ID_OBJ_EXT_ALT  = 0x02000000, // extended in external data (eg, 2MASS)
-  ID_OBJ_GOOD     = 0x04000000, // good-quality measurement in our data (eg, PS)
-  ID_OBJ_GOOD_ALT = 0x08000000, // good-quality measurement in external data (eg, 2MASS)
+  ID_OBJ_GOOD     = 0x04000000, // good-quality measurement in our data (eg,PS)
+  ID_OBJ_GOOD_ALT = 0x08000000, // good-quality measurement in  external data (eg, 2MASS)
 } DVOAverageFlags;
 
@@ -233,5 +233,5 @@
      *** that is just silly, and bad: convert to using Nsec_mem, Nsec_disk, Nsec_off.
      *** unless we always require the secfilt and average entries to be loaded sychronously.
-   */
+     */
 
   /* pointers to split data files */
@@ -293,5 +293,5 @@
 int isRegisteredMosaic (void);
 off_t GetRegisteredMosaic (void);
-off_t *GetChipMatch ();
+off_t *GetChipMatch (void);
 int GetMosaicCoords (Coords *coords);
 int FindMosaicForImage (Image *images, off_t Nimages, off_t entry);