Index: trunk/Ohana/src/libfits/Makefile
===================================================================
--- trunk/Ohana/src/libfits/Makefile	(revision 6996)
+++ trunk/Ohana/src/libfits/Makefile	(revision 7039)
@@ -22,5 +22,5 @@
 libfits: $(LIB)/libFITS.$(ARCH).a
 
-INCS = $(DESTINC)/fitsio.h 
+INCS = $(DESTINC)/gfitsio.h 
 
 HEADER_OBJ = \
Index: trunk/Ohana/src/libfits/doc/sample.c
===================================================================
--- trunk/Ohana/src/libfits/doc/sample.c	(revision 6996)
+++ trunk/Ohana/src/libfits/doc/sample.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 # define TRUE 1
 
Index: trunk/Ohana/src/libfits/doc/sample2.c
===================================================================
--- trunk/Ohana/src/libfits/doc/sample2.c	(revision 6996)
+++ trunk/Ohana/src/libfits/doc/sample2.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 # include <stdio.h>
 # define TRUE 1
Index: trunk/Ohana/src/libfits/header/F_H_field.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_H_field.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_H_field.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits header field ****************************/
Index: trunk/Ohana/src/libfits/header/F_copy_H.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_copy_H.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_copy_H.c	(revision 7039)
@@ -1,7 +1,7 @@
 # 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;
@@ -24,4 +24,2 @@
   return (TRUE);
 }	
-
-
Index: trunk/Ohana/src/libfits/header/F_create_H.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_create_H.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_create_H.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 # define NBYTES 2880
 
Index: trunk/Ohana/src/libfits/header/F_delete.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_delete.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_delete.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits delete ****************************/
Index: trunk/Ohana/src/libfits/header/F_free_H.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_free_H.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_free_H.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits free header ***********************************/
Index: trunk/Ohana/src/libfits/header/F_init_H.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_init_H.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_init_H.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 int FT_UNSIGN_MODE;
 
Index: trunk/Ohana/src/libfits/header/F_insert_array.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_insert_array.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_insert_array.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits insert array ***********************************/
Index: trunk/Ohana/src/libfits/header/F_modify.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_modify.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_modify.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 char *fits_keyword_start (char *line);
Index: trunk/Ohana/src/libfits/header/F_print.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_print.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_print.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 int fits_print (Header *header, char *field, char *mode, int N,...) {
Index: trunk/Ohana/src/libfits/header/F_read_H.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_read_H.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_read_H.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 int FT_UNSIGN_MODE;
 
Index: trunk/Ohana/src/libfits/header/F_read_XH.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_read_XH.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_read_XH.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 int FT_UNSIGN_MODE;
 
Index: trunk/Ohana/src/libfits/header/F_scan.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_scan.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_scan.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 char *fits_keyword_start (char *line);
Index: trunk/Ohana/src/libfits/header/F_write_H.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_write_H.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/F_write_H.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits write header ***********************************/
Index: trunk/Ohana/src/libfits/header/version.c
===================================================================
--- trunk/Ohana/src/libfits/header/version.c	(revision 6996)
+++ trunk/Ohana/src/libfits/header/version.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 static char *name = "$Name: not supported by cvs2svn $";
 
Index: trunk/Ohana/src/libfits/include/gfitsio.h
===================================================================
--- trunk/Ohana/src/libfits/include/gfitsio.h	(revision 6996)
+++ trunk/Ohana/src/libfits/include/gfitsio.h	(revision 7039)
@@ -90,5 +90,6 @@
 /******************************* 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 *)); 
Index: trunk/Ohana/src/libfits/matrix/F_add_M.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_add_M.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_add_M.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits insert array ***********************************/
Index: trunk/Ohana/src/libfits/matrix/F_add_M_value.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_add_M_value.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_add_M_value.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /***************** fits add matrix value ***********************************/
Index: trunk/Ohana/src/libfits/matrix/F_convert_format.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_convert_format.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_convert_format.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 # define CONVERTDOWN \
Index: trunk/Ohana/src/libfits/matrix/F_copy_M.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_copy_M.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_copy_M.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits copy header ***********************************/
Index: trunk/Ohana/src/libfits/matrix/F_create_M.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_create_M.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_create_M.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits create matrix *******************************/
Index: trunk/Ohana/src/libfits/matrix/F_divide_M.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_divide_M.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_divide_M.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /********************* fits divide matrix ***********************************/
Index: trunk/Ohana/src/libfits/matrix/F_free_M.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_free_M.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_free_M.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits free matrix ***********************************/
Index: trunk/Ohana/src/libfits/matrix/F_get_M_value.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_get_M_value.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_get_M_value.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /***************** fits get matrix value ***********************************/
Index: trunk/Ohana/src/libfits/matrix/F_insert_M.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_insert_M.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_insert_M.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits insert array ***********************************/
Index: trunk/Ohana/src/libfits/matrix/F_load_M.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_load_M.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_load_M.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 int fits_fread_matrix (FILE *f, Matrix *matrix, Header *header) {
Index: trunk/Ohana/src/libfits/matrix/F_matrix.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_matrix.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_matrix.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 int fits_matrix_size (Header *header) {
Index: trunk/Ohana/src/libfits/matrix/F_multiply_M.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_multiply_M.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_multiply_M.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /******************* fits multiply matrix ***********************************/
Index: trunk/Ohana/src/libfits/matrix/F_read_M.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_read_M.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_read_M.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits read matrix ***********************************/
Index: trunk/Ohana/src/libfits/matrix/F_read_portion.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_read_portion.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_read_portion.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 # ifndef SEEK_CUR 
 # define SEEK_SET 0   
Index: trunk/Ohana/src/libfits/matrix/F_read_segment.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_read_segment.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_read_segment.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /** warning: this function requires 'dparse' which is included in libohana.a **/
Index: trunk/Ohana/src/libfits/matrix/F_set_M_value.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_set_M_value.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_set_M_value.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /****************** fits set matrix value ***********************************/
Index: trunk/Ohana/src/libfits/matrix/F_write_M.c
===================================================================
--- trunk/Ohana/src/libfits/matrix/F_write_M.c	(revision 6996)
+++ trunk/Ohana/src/libfits/matrix/F_write_M.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits write matrix ***********************************/
Index: trunk/Ohana/src/libfits/table/F_create_T.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_create_T.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_create_T.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits create table *******************************/
Index: trunk/Ohana/src/libfits/table/F_create_TH.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_create_TH.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_create_TH.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /* a basic table header (extension) is different from a primary header
Index: trunk/Ohana/src/libfits/table/F_define_column.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_define_column.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_define_column.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /***********************/
Index: trunk/Ohana/src/libfits/table/F_free_T.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_free_T.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_free_T.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 int fits_free_table (FTable *table) {
Index: trunk/Ohana/src/libfits/table/F_get_T_column.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_get_T_column.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_get_T_column.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits get table column *****************************/
Index: trunk/Ohana/src/libfits/table/F_get_T_value.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_get_T_value.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_get_T_value.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits get table value ********************************/
Index: trunk/Ohana/src/libfits/table/F_get_column.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_get_column.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_get_column.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 # define SWAP_BYTE \
   tmp = Pin[0]; Pin[0] = Pin[1]; Pin[1] = tmp;
Index: trunk/Ohana/src/libfits/table/F_read_T.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_read_T.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_read_T.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits read table ***********************************/
Index: trunk/Ohana/src/libfits/table/F_read_TH.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_read_TH.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_read_TH.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits read Theader ***********************************/
Index: trunk/Ohana/src/libfits/table/F_set_column.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_set_column.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_set_column.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 # define SWAP_BYTE \
   tmp = Pout[0]; Pout[0] = Pout[1]; Pout[1] = tmp;
Index: trunk/Ohana/src/libfits/table/F_table_column.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_table_column.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_table_column.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits table column ****************************/
Index: trunk/Ohana/src/libfits/table/F_table_format.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_table_format.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_table_format.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /***********************/
Index: trunk/Ohana/src/libfits/table/F_table_row.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_table_row.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_table_row.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits table column ****************************/
Index: trunk/Ohana/src/libfits/table/F_write_T.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_write_T.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_write_T.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits write header *********************************/
Index: trunk/Ohana/src/libfits/table/F_write_TH.c
===================================================================
--- trunk/Ohana/src/libfits/table/F_write_TH.c	(revision 6996)
+++ trunk/Ohana/src/libfits/table/F_write_TH.c	(revision 7039)
@@ -1,4 +1,4 @@
 # include <ohana.h>
-# include <fitsio.h>
+# include <gfitsio.h>
 
 /*********************** fits write header *********************************/