Index: trunk/Ohana/src/dvomerge/include/dvomerge.h
===================================================================
--- trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 39300)
+++ trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 39301)
@@ -45,5 +45,8 @@
 char  *UPDATE_CATFORMAT;
 char  *UPDATE_CATCOMPRESS;
-char  *RESTRICT_CPT;
+
+char  *CPTLIST_FILENAME;
+char **CPTLIST;
+int   NCPTLIST;
 
 int    MATCH_BY_EXTERN_ID;
@@ -208,5 +211,5 @@
 int        dvomergeFromList       PROTO((int argc, char **argv));
 int 	   dvomergeUpdate_threaded PROTO((int argc, char **argv));
-int        dvomergeUpdate_catalogs PROTO((char *input, char *output, SkyTable *outsky, SkyList *inlist, int NsecfiltInput, int NsecfiltOutput, IDmapType *IDmap, int *secfiltMap));
+int        dvomergeUpdate_catalogs PROTO((char *input, char *output, SkyList *inlist, SkyTable *outsky, int NsecfiltInput, int NsecfiltOutput, IDmapType *IDmap, int *secfiltMap));
 
 int 	   dvo_image_match_dbs_by_time_and_photcode PROTO((IDmapType *IDmap, FITS_DB *tgt, FITS_DB *src));
@@ -262,2 +265,3 @@
 int dvorepairFixStackIDs (int argc, char **argv);
 
+char **load_cptlist (char *filename, int *nlist);