Index: trunk/Ohana/src/addstar/include/addstar.h
===================================================================
--- trunk/Ohana/src/addstar/include/addstar.h	(revision 3361)
+++ trunk/Ohana/src/addstar/include/addstar.h	(revision 3376)
@@ -4,4 +4,5 @@
 # include <sys/time.h>
 # include <time.h>
+# include <zlib.h>
 
 /* used in find_matches, find_matches_refstars */
@@ -12,5 +13,5 @@
 /* grab named photcode */
 # define NAMED_PHOTCODE(CODE,NAME) \
-  CODE = GetPhotcodebyName (NAME); \
+  CODE = GetPhotcodeCodebyName (NAME); \
   if (!CODE) { \
     fprintf (stderr, "ERROR:  photcode %s not found in photcode table\n", NAME); \
@@ -47,4 +48,7 @@
 char   GSCFILE[256];
 char   CATDIR[256];
+char   TWO_MASS_DIR[256];
+char   GSCDIR[256];
+char   CDROM[256];
 double DEFAULT_RADIUS, NSIGMA, SNLIMIT;
 double ZeroPt;
@@ -57,5 +61,5 @@
 
 PhotCode *thiscode;
-GSCRegion patch;
+GSCRegion UserPatch;
 
 char DateKeyword[64];
@@ -86,5 +90,5 @@
 
 int main (int argc, char **argv);
-int Shutdown ();  
+int Shutdown (char *message, ...);  
 void TrapSignal (int sig);
 int SetSignals ();
@@ -122,4 +126,6 @@
 void fsort (float *X, int N);
 void fsort2 (float *X, float *Y, int N);
+void sort_stars (Stars *stars, int N);
+void sort_regions (GSCRegion *region, int N);
 
 char *sec_to_date (time_t second);
@@ -147,5 +153,5 @@
 Stars *get2mass (GSCRegion *patch, int *NSTARS);
 TM_Region *get2mass_acc (GSCRegion *patch, int *nfiles);
-Stars *get2mass_data (char *filename, GSCRegion *patch, int *nstars);
+Stars *get2mass_data (TM_Region *region, GSCRegion *patch, int *nstars);
 GSCRegion *gregion_stars (Stars *stars, int Nstars, int *Nregion);
 Stars *grefstars (char *file, int *Nstars);
@@ -180,5 +186,4 @@
 int replace_match (Average *average, Measure *measure, Stars *star);
 FILE *GetDB (int *state);
-int Shutdown ();
 void lock_image_db ();
 void unlock_image_db (Image *image);