Changeset 34405 for trunk/Ohana/src/addstar/include/addstar.h

Timestamp:

Sep 5, 2012, 4:25:56 PM (14 years ago)

Author:

eugene

Message:

merging change from eam_branches/ipp-20120805: adding psfQF, psfQFperf to both average and measure; deprecate average.Xp

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/include/addstar.h (modified) (3 diffs)

trunk/Ohana/src/addstar/include/addstar.h

@@ -59 +59 @@
 typedef struct sockaddr_in SockAddress;
 
-enum {ADDSTAR_MODE_NONE, ADDSTAR_MODE_IMAGE, ADDSTAR_MODE_REFLIST, ADDSTAR_MODE_REFCAT, ADDSTAR_MODE_FAKEIMAGE, ADDSTAR_MODE_RESORT};
+enum {ADDSTAR_MODE_NONE, ADDSTAR_MODE_IMAGE, ADDSTAR_MODE_REFLIST, ADDSTAR_MODE_REFCAT, ADDSTAR_MODE_FAKEIMAGE, ADDSTAR_MODE_RESORT, ADDSTAR_MODE_CREATE_ID};
 enum {NONE, SIMPLE_CMP, SIMPLE_CMF, SIMPLE_MEF, MOSAIC_CMP, MOSAIC_CMF, MOSAIC_MEF, MOSAIC_PHU, SDSS_OBJ};
 /* note: MEF implies CMF */
@@ -269 +269 @@
 int        NewReflist_Thread      PROTO((int BindSocket));
 
-Stars     *Convert_SMPDATA        PROTO((FTable *table, unsigned int *nstars));
-Stars     *Convert_PS1_DEV_0      PROTO((FTable *table, unsigned int *nstars));
-Stars     *Convert_PS1_DEV_1      PROTO((FTable *table, unsigned int *nstars));
-Stars     *Convert_PS1_V1         PROTO((FTable *table, unsigned int *nstars));
-Stars     *Convert_PS1_V1_Alt     PROTO((FTable *table, unsigned int *nstars));
-Stars     *Convert_PS1_V2         PROTO((FTable *table, unsigned int *nstars));
-Stars     *Convert_PS1_V3         PROTO((FTable *table, unsigned int *nstars));
-Stars     *Convert_PS1_SV1        PROTO((FTable *table, unsigned int *nstars));
-Stars     *Convert_PS1_SV1_Alt    PROTO((FTable *table, unsigned int *nstars));
-
 int        InitStar               PROTO((Stars *star));
 
@@ -303 +293 @@
 // this is a gnu extension?? caution!
 void *memrchr(const void *s, int c, size_t n);
+int addstar_create_ID ();
 
 /**