Changeset 27517 for branches/eam_branches/20100225/Ohana/src/imregister/include/imregister.h

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/imregister/include/imregister.h (modified) (2 diffs)

branches/eam_branches/20100225/Ohana/src/imregister/include/imregister.h

@@ -73 +73 @@
 
 int parse_time (Header *header);
-void sort (float *value, int N);
-void dsort (double *value, int N);
-void sortstr (char **S, int *X, int N);
-void sortpair (int *X, int *Y, int N);
+void sortstr (char **S, off_t *X, off_t N);
 
 void ConfigCamera (void);
@@ -92 +89 @@
 
 void warn_scan (Header *header, char *field, char *format, int N, void *var);
-int gfits_scan_nchar (Header *header, int size, char *field, int N,...);
+int gfits_scan_nchar (Header *header, int size, char *field, int N,...) OHANA_FORMAT(scanf, 3, 5);
 void warn_scan_nchar (Header *header, int size, char *field, int N, void *var);