Context Navigation

← Previous Changeset
Next Changeset →

Changeset 7039

Timestamp:

May 2, 2006, 9:08:48 AM (20 years ago)

Author:

eugene

Message:

allowing elixir fits and cfitsio to co-compile

Location:

trunk/Ohana/src

Files:

: 2 added
: 68 edited

addstar/src/resort_catalog.c (added)
elixir/include/controller.h (modified) (1 diff)
gophot/include/gophot.h (modified) (1 diff)
libautocode/def/common.h (modified) (1 diff)
libdvo/include/dvo.h (modified) (1 diff)
libfits/Makefile (modified) (1 diff)
libfits/doc/sample.c (modified) (1 diff)
libfits/doc/sample2.c (modified) (1 diff)
libfits/header/F_H_field.c (modified) (1 diff)
libfits/header/F_copy_H.c (modified) (2 diffs)
libfits/header/F_create_H.c (modified) (1 diff)
libfits/header/F_delete.c (modified) (1 diff)
libfits/header/F_free_H.c (modified) (1 diff)
libfits/header/F_init_H.c (modified) (1 diff)
libfits/header/F_insert_array.c (modified) (1 diff)
libfits/header/F_modify.c (modified) (1 diff)
libfits/header/F_print.c (modified) (1 diff)
libfits/header/F_read_H.c (modified) (1 diff)
libfits/header/F_read_XH.c (modified) (1 diff)
libfits/header/F_scan.c (modified) (1 diff)
libfits/header/F_write_H.c (modified) (1 diff)
libfits/header/version.c (modified) (1 diff)
libfits/include/gfitsio.h (modified) (1 diff)
libfits/matrix/F_add_M.c (modified) (1 diff)
libfits/matrix/F_add_M_value.c (modified) (1 diff)
libfits/matrix/F_convert_format.c (modified) (1 diff)
libfits/matrix/F_copy_M.c (modified) (1 diff)
libfits/matrix/F_create_M.c (modified) (1 diff)
libfits/matrix/F_divide_M.c (modified) (1 diff)
libfits/matrix/F_free_M.c (modified) (1 diff)
libfits/matrix/F_get_M_value.c (modified) (1 diff)
libfits/matrix/F_insert_M.c (modified) (1 diff)
libfits/matrix/F_load_M.c (modified) (1 diff)
libfits/matrix/F_matrix.c (modified) (1 diff)
libfits/matrix/F_multiply_M.c (modified) (1 diff)
libfits/matrix/F_read_M.c (modified) (1 diff)
libfits/matrix/F_read_portion.c (modified) (1 diff)
libfits/matrix/F_read_segment.c (modified) (1 diff)
libfits/matrix/F_set_M_value.c (modified) (1 diff)
libfits/matrix/F_write_M.c (modified) (1 diff)
libfits/table/F_create_T.c (modified) (1 diff)
libfits/table/F_create_TH.c (modified) (1 diff)
libfits/table/F_define_column.c (modified) (1 diff)
libfits/table/F_free_T.c (modified) (1 diff)
libfits/table/F_get_T_column.c (modified) (1 diff)
libfits/table/F_get_T_value.c (modified) (1 diff)
libfits/table/F_get_column.c (modified) (1 diff)
libfits/table/F_read_T.c (modified) (1 diff)
libfits/table/F_read_TH.c (modified) (1 diff)
libfits/table/F_set_column.c (modified) (1 diff)
libfits/table/F_table_column.c (modified) (1 diff)
libfits/table/F_table_format.c (modified) (1 diff)
libfits/table/F_table_row.c (modified) (1 diff)
libfits/table/F_write_T.c (modified) (1 diff)
libfits/table/F_write_TH.c (modified) (1 diff)
libohana/include/ohana.h (modified) (1 diff)
misc/src/ckfits.c (modified) (1 diff)
misc/src/fhead.c (modified) (1 diff)
misc/src/fields.c (modified) (1 diff)
misc/src/fits_insert.c (modified) (1 diff)
misc/src/fiximg.c (modified) (1 diff)
misc/src/ftable.c (modified) (1 diff)
misc/src/gtfringetable.c (modified) (1 diff)
misc/src/medianfilter.c (modified) (1 diff)
misc/src/mefhead.c (modified) (1 diff)
misc/src/mkfringetable.c (modified) (1 diff)
misc/src/posscontour.c (modified) (1 diff)
misc/src/test.c (modified) (1 diff)
opihi/cmd.astro/warp.c (added)
opihi/include/external.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/Ohana/src/elixir/include/controller.h

r5242	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	# include <signal.h>
4	4	# include <errno.h>

trunk/Ohana/src/gophot/include/gophot.h

r5242	r7039
2	2
3	3	# include <ohana.h>
4		# include <fitsio.h>
	4	# include <gfitsio.h>
5	5
6	6	typedef char bool;

trunk/Ohana/src/libautocode/def/common.h

r5451	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	# ifndef AUTOCODE_H

trunk/Ohana/src/libdvo/include/dvo.h

r6683	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	# include <autocode.h>
4	4

trunk/Ohana/src/libfits/Makefile

r5238	r7039
22	22	libfits: $(LIB)/libFITS.$(ARCH).a
23	23
24		INCS = $(DESTINC)/fitsio.h
	24	INCS = $(DESTINC)/gfitsio.h
25	25
26	26	HEADER_OBJ = \

trunk/Ohana/src/libfits/doc/sample.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	# define TRUE 1
4	4

trunk/Ohana/src/libfits/doc/sample2.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	# include <stdio.h>
4	4	# define TRUE 1

trunk/Ohana/src/libfits/header/F_H_field.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits header field **************************/

trunk/Ohana/src/libfits/header/F_copy_H.c

-              r5238
+              r7039
 # include <ohana.h>
 # include <fitsio.h>
+# include <gfitsio.h>
 /*********************** fits copy header ***********************************/
 int fits_copy_header (Header *in, Header *out) {
+int gfits_copy_header (Header *in, Header *out) {
   int i;
 …
   return (TRUE);
+}

trunk/Ohana/src/libfits/header/F_create_H.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	# define NBYTES 2880
4	4

trunk/Ohana/src/libfits/header/F_delete.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits delete **************************/

trunk/Ohana/src/libfits/header/F_free_H.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits free header *********************************/

trunk/Ohana/src/libfits/header/F_init_H.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	int FT_UNSIGN_MODE;
4	4

trunk/Ohana/src/libfits/header/F_insert_array.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits insert array *********************************/

trunk/Ohana/src/libfits/header/F_modify.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	char fits_keyword_start (char line);

trunk/Ohana/src/libfits/header/F_print.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	int fits_print (Header header, char field, char *mode, int N,...) {

trunk/Ohana/src/libfits/header/F_read_H.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	int FT_UNSIGN_MODE;
4	4

trunk/Ohana/src/libfits/header/F_read_XH.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	int FT_UNSIGN_MODE;
4	4

trunk/Ohana/src/libfits/header/F_scan.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	char fits_keyword_start (char line);

trunk/Ohana/src/libfits/header/F_write_H.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits write header *********************************/

trunk/Ohana/src/libfits/header/version.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	static char *name = "$Name: not supported by cvs2svn $";
4	4

trunk/Ohana/src/libfits/include/gfitsio.h

-              r6996
+              r7039
 /******************************* Header functions *************/
 int   fits_read_header            PROTO((char *, Header *));
+int   fits_copy_header            PROTO((Header *, Header *));
+// int   fits_copy_header            PROTO((Header *, Header *));
+int   gfits_copy_header           PROTO((Header *, Header *));
 void  fits_free_header            PROTO((Header *));
 int   fits_write_header           PROTO((char *, Header *));

trunk/Ohana/src/libfits/matrix/F_add_M.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits insert array *********************************/

trunk/Ohana/src/libfits/matrix/F_add_M_value.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/*************** fits add matrix value *********************************/

trunk/Ohana/src/libfits/matrix/F_convert_format.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	# define CONVERTDOWN \

trunk/Ohana/src/libfits/matrix/F_copy_M.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits copy header *********************************/

trunk/Ohana/src/libfits/matrix/F_create_M.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits create matrix *****************************/

trunk/Ohana/src/libfits/matrix/F_divide_M.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/******************* fits divide matrix *********************************/

trunk/Ohana/src/libfits/matrix/F_free_M.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits free matrix *********************************/

trunk/Ohana/src/libfits/matrix/F_get_M_value.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/*************** fits get matrix value *********************************/

trunk/Ohana/src/libfits/matrix/F_insert_M.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits insert array *********************************/

trunk/Ohana/src/libfits/matrix/F_load_M.c

r5851	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	int fits_fread_matrix (FILE f, Matrix matrix, Header *header) {

trunk/Ohana/src/libfits/matrix/F_matrix.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	int fits_matrix_size (Header *header) {

trunk/Ohana/src/libfits/matrix/F_multiply_M.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/***************** fits multiply matrix *********************************/

trunk/Ohana/src/libfits/matrix/F_read_M.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits read matrix *********************************/

trunk/Ohana/src/libfits/matrix/F_read_portion.c

r5851	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	# ifndef SEEK_CUR
4	4	# define SEEK_SET 0

trunk/Ohana/src/libfits/matrix/F_read_segment.c

r5851	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/ warning: this function requires 'dparse' which is included in libohana.a /

trunk/Ohana/src/libfits/matrix/F_set_M_value.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/**************** fits set matrix value *********************************/

trunk/Ohana/src/libfits/matrix/F_write_M.c

r5851	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits write matrix *********************************/

trunk/Ohana/src/libfits/table/F_create_T.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits create table *****************************/

trunk/Ohana/src/libfits/table/F_create_TH.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/* a basic table header (extension) is different from a primary header

trunk/Ohana/src/libfits/table/F_define_column.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/***********************/

trunk/Ohana/src/libfits/table/F_free_T.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	int fits_free_table (FTable *table) {

trunk/Ohana/src/libfits/table/F_get_T_column.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits get table column ***************************/

trunk/Ohana/src/libfits/table/F_get_T_value.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits get table value ******************************/

trunk/Ohana/src/libfits/table/F_get_column.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	# define SWAP_BYTE \
4	4	tmp = Pin[0]; Pin[0] = Pin[1]; Pin[1] = tmp;

trunk/Ohana/src/libfits/table/F_read_T.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits read table *********************************/

trunk/Ohana/src/libfits/table/F_read_TH.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits read Theader *********************************/

trunk/Ohana/src/libfits/table/F_set_column.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	# define SWAP_BYTE \
4	4	tmp = Pout[0]; Pout[0] = Pout[1]; Pout[1] = tmp;

trunk/Ohana/src/libfits/table/F_table_column.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits table column **************************/

trunk/Ohana/src/libfits/table/F_table_format.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/***********************/

trunk/Ohana/src/libfits/table/F_table_row.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits table column **************************/

trunk/Ohana/src/libfits/table/F_write_T.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits write header *******************************/

trunk/Ohana/src/libfits/table/F_write_TH.c

r5238	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	/********************* fits write header *******************************/

trunk/Ohana/src/libohana/include/ohana.h

-              r6674
+              r7039
 # define OHANA_H
+# ifndef TRUE
 # define TRUE (1)
+# endif
+# ifndef FALSE
 # define FALSE (0)
+# endif
 # define SIGN(X)  (((X) == 0) ? 0 : ((fabs((double)(X))) / (X)))
 # define ROUND(X) ((int) ((X) + 0.5*SIGN(X)))

trunk/Ohana/src/misc/src/ckfits.c

r5240	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	int main (int argc, char **argv) {

trunk/Ohana/src/misc/src/fhead.c

r5240	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	int main (int argc, char **argv) {

trunk/Ohana/src/misc/src/fields.c

r5240	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	int main (int argc, char **argv) {

trunk/Ohana/src/misc/src/fits_insert.c

r5240	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	static char reserved[] = "COMMENT Reserved space. This line can be used to add a new FITS card. ";

trunk/Ohana/src/misc/src/fiximg.c

r5240	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	int main (int argc, char **argv) {

trunk/Ohana/src/misc/src/ftable.c

r5240	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	char print_table_row (char row, Header *header);

trunk/Ohana/src/misc/src/gtfringetable.c

-              r5240
+              r7039
 # include <ohana.h>
 # include <fitsio.h>
+# include <gfitsio.h>
 static char *version = "gtfringetable $Revision: 1.3 $";
+static char *version = "gtfringetable $Revision: 1.4 $";
 void get_version (int argc, char **argv, char *version);

trunk/Ohana/src/misc/src/medianfilter.c

r5240	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	# define D_NFILES 100

trunk/Ohana/src/misc/src/mefhead.c

r5240	r7039
1	1	# include <ohana.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3
4	4	int main (int argc, char **argv) {

trunk/Ohana/src/misc/src/mkfringetable.c

-              r5240
+              r7039
 # include <ohana.h>
 # include <fitsio.h>
 static char *version = "mkfringetable $Revision: 1.6 $";
+# include <gfitsio.h>
+static char *version = "mkfringetable $Revision: 1.7 $";
 void get_version (int argc, char **argv, char *version);

trunk/Ohana/src/misc/src/posscontour.c

r2417	r7039
1	1	# include <stdio.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	# include <math.h>
4	4	# include <malloc.h>

trunk/Ohana/src/misc/src/test.c

r2417	r7039
1	1	# include <stdio.h>
2		# include <fitsio.h>
	2	# include <gfitsio.h>
3	3	# include <math.h>
4	4	# include <malloc.h>

trunk/Ohana/src/opihi/include/external.h

r4689	r7039
12	12
13	13	# include <ohana.h>
14		~~# include <fitsio.h>~~
15	14	# include <dvo.h>
16	15

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 7039

Legend:

Download in other formats: