Index: trunk/Ohana/src/opihi/include/dvoshell.h
===================================================================
--- trunk/Ohana/src/opihi/include/dvoshell.h	(revision 20936)
+++ trunk/Ohana/src/opihi/include/dvoshell.h	(revision 21153)
@@ -33,4 +33,5 @@
       MAG_REF, 
       MAG_ERR, 
+      MAG_PHOT_FLAGS, 
       MAG_CHISQ,
       MAG_NCODE,
@@ -99,4 +100,5 @@
       MEAS_DET_ID, 
       MEAS_OBJ_ID, 
+      MEAS_CAT_ID, 
       MEAS_IMAGE_ID, 
       MEAS_PSF_QF, 
@@ -262,8 +264,8 @@
 double       *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
 double       *ExtractMeasuresDMag   PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
-void          FreeImageSelection    PROTO(());
-void          FreeImageSelection    PROTO(());
+void          FreeImageSelection    PROTO((void));
+void          FreeImageSelection    PROTO((void));
 int           GetAverageParam       PROTO((char *parname));
-void          GetAverageParamHelp   PROTO(());
+void          GetAverageParamHelp   PROTO((void));
 int           GetMagMode            PROTO((char *string));
 double        GetMeasure            PROTO((int param, Average *average, Measure *measure, double mag));
@@ -271,9 +273,9 @@
 int           GetMeasureTypeCode    PROTO((Measure *measure));
 int           GetPhotcodeInfo       PROTO((char *string, PhotCode **Code, int *Mode));
-int           GetSelectionParam     PROTO(());
+int           GetSelectionParam     PROTO((void));
 int           GetTimeSelection      PROTO((time_t *tz, time_t *te));
-void          InitDVO               PROTO(());
-void          FreeDVO               PROTO(());
-int           InitPhotcodes         PROTO(());
+void          InitDVO               PROTO((void));
+void          FreeDVO               PROTO((void));
+int           InitPhotcodes         PROTO((void));
 Image        *LoadImages            PROTO((int *Nimage));
 Image        *MatchImage            PROTO((unsigned int time, short int source));
@@ -285,6 +287,6 @@
 SkyList      *SkyListLoadFile       PROTO((char *filename));
 int           SetCATDIR             PROTO((char *path, int verbose));
-char *        GetCATDIR             PROTO(());
-SkyTable     *GetSkyTable           PROTO(());
+char *        GetCATDIR             PROTO((void));
+SkyTable     *GetSkyTable           PROTO((void));
 SkyList      *SkyListFromFile       PROTO((char *filename));
 SkyRegionSelection *SetRegionSelection    PROTO((int *argc, char **argv));
@@ -339,5 +341,5 @@
 int get_skyregion (double *Rs, double *Re, double *Ds, double *De);
 int set_skyregion (double Rs, double Re, double Ds, double De);
-void FreeImageSelection ();
+void FreeImageSelection (void);
 
 void FreeSkyRegionSelection (SkyRegionSelection *selection);
@@ -345,14 +347,14 @@
 
 int dbExtractMeasuresInitTransform (CoordTransformSystem target);
-int dbExtractMeasuresInitAve ();
-int dbExtractMeasuresInitMeas ();
-int dbExtractMeasuresInit ();
+int dbExtractMeasuresInitAve (void);
+int dbExtractMeasuresInitMeas (void);
+int dbExtractMeasuresInit (void);
 
 int dbExtractAveragesInitTransform (CoordTransformSystem target);
-int dbExtractAveragesInit ();
+int dbExtractAveragesInit (void);
 
 int dbExtractImagesInitTransform (CoordTransformSystem target);
-int dbExtractImagesInit ();
-int dbExtractImagesReset ();
+int dbExtractImagesInit (void);
+int dbExtractImagesReset (void);
 
 # endif