Index: trunk/Ohana/src/libautocode/def/autocode.c
===================================================================
--- trunk/Ohana/src/libautocode/def/autocode.c	(revision 7039)
+++ trunk/Ohana/src/libautocode/def/autocode.c	(revision 7080)
@@ -1,5 +1,5 @@
 # include "autocode.h"
 
-int fits_convert_$STRUCT ($STRUCT *data, int size, int nitems) {
+int gfits_convert_$STRUCT ($STRUCT *data, int size, int nitems) {
 
   int i;
@@ -28,5 +28,5 @@
 /*** add test of EXTNAME and header-defined columns? ***/
 /* return internal structure representation */
-$STRUCT *fits_table_get_$STRUCT (FTable *ftable, int *Ndata, int *swapped) {
+$STRUCT *gfits_table_get_$STRUCT (FTable *ftable, int *Ndata, int *swapped) {
 
   $STRUCT *data;
@@ -35,5 +35,5 @@
   data = ($STRUCT *) ftable[0].buffer;
   if ((swapped == NULL) || (*swapped == FALSE)) {
-    fits_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata);
+    gfits_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata);
     if (swapped != NULL) *swapped = TRUE;
   }
@@ -41,5 +41,5 @@
 }
 
-int fits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, int Ndata) {
+int gfits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, int Ndata) {
 
   Header *header;
@@ -48,5 +48,5 @@
 
   /* create table header */
-  fits_create_table_header (header, "$TYPE", "$EXTNAME");
+  gfits_create_table_header (header, "$TYPE", "$EXTNAME");
 
   /* define table layout */
@@ -54,17 +54,17 @@
 
   /* create table */
-  fits_create_table (header, ftable);
+  gfits_create_table (header, ftable);
 
   /* add data values */
-  fits_convert_$STRUCT (data, sizeof ($STRUCT), Ndata);
-  fits_add_rows (ftable, (char *) data, Ndata, sizeof ($STRUCT));
+  gfits_convert_$STRUCT (data, sizeof ($STRUCT), Ndata);
+  gfits_add_rows (ftable, (char *) data, Ndata, sizeof ($STRUCT));
 
   return (TRUE);
 }
 
-int fits_table_mkheader_$STRUCT (Header *header) {
+int gfits_table_mkheader_$STRUCT (Header *header) {
 
   /* create table header */
-  fits_create_table_header (header, "$TYPE", "$EXTNAME");
+  gfits_create_table_header (header, "$TYPE", "$EXTNAME");
 
   /* define table layout */
@@ -88,5 +88,5 @@
   }
 
-  fits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), Ndata);
+  gfits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), Ndata);
 
   SendCommand (device, 16, "NVALUE: %6d", Ndata);
@@ -113,5 +113,5 @@
   
   tmpdata = ($STRUCT *) message.buffer;
-  fits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), ndata);
+  gfits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), ndata);
 
   /* double-check data length? */
Index: trunk/Ohana/src/libautocode/def/autocode.h
===================================================================
--- trunk/Ohana/src/libautocode/def/autocode.h	(revision 7039)
+++ trunk/Ohana/src/libautocode/def/autocode.h	(revision 7080)
@@ -2,8 +2,8 @@
 /** STRUCT DEFINITION **/
 
-$STRUCT *fits_table_get_$STRUCT (FTable *table, int *Ndata, int *swapped);
-int      fits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, int Ndata);
-int      fits_table_mkheader_$STRUCT (Header *header);
-int      fits_convert_$STRUCT ($STRUCT *data, int size, int nitems);
+$STRUCT *gfits_table_get_$STRUCT (FTable *table, int *Ndata, int *swapped);
+int      gfits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, int Ndata);
+int      gfits_table_mkheader_$STRUCT (Header *header);
+int      gfits_convert_$STRUCT ($STRUCT *data, int size, int nitems);
 int Send_$STRUCT (int device, $STRUCT *data, int Ndata, int copy);
 int Recv_$STRUCT (int device, $STRUCT **data, int *Ndata);
Index: trunk/Ohana/src/libautocode/doc/ChangeLog.txt
===================================================================
--- trunk/Ohana/src/libautocode/doc/ChangeLog.txt	(revision 7039)
+++ trunk/Ohana/src/libautocode/doc/ChangeLog.txt	(revision 7080)
@@ -1,2 +1,6 @@
+
+- libautocode 1.5
+  * converted to gfits APIs (forces libfits 1.6)
+  * fixed comma errors in average tables
 
 - libautocode 1.4
Index: trunk/Ohana/src/libautocode/generate
===================================================================
--- trunk/Ohana/src/libautocode/generate	(revision 7039)
+++ trunk/Ohana/src/libautocode/generate	(revision 7080)
@@ -140,5 +140,5 @@
 	}
 
-	printf FILE "  fits_define_bintable_column (header, ";
+	printf FILE "  gfits_define_bintable_column (header, ";
 	printf FILE "%-8s",               "\"$pt2\", ";
 	printf FILE "%-20s",              "\"$field[$i]\", ";
@@ -225,5 +225,5 @@
 	if (!$pt1) { die "unknown type $type"; }
 
-	printf FILE "  fits_define_table_column (header, ";
+	printf FILE "  gfits_define_table_column (header, ";
 	printf FILE "%-8s",      "\"$pt1\", ";
 	printf FILE "%-20s",     "\"$field[$i]\", ";