From 0560c11c20476a8c99316bd88f1b6924afa057f9 Mon Sep 17 00:00:00 2001
From: Scot Breitenfeld <brtnfld@hdfgroup.org>
Date: Thu, 28 May 2015 10:01:37 -0500
Subject: [svn-r27119] handles INTEGER*16 case

---
 configure                   | 8 ++++----
 fortran/src/H5match_types.c | 2 +-
 m4/aclocal_fc.m4            | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index e01b5c2..15a76dc 100755
--- a/configure
+++ b/configure
@@ -7041,8 +7041,8 @@ else
              ENDIF
              IF (k .LE. 0) EXIT
         ENDDO
-        IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " "
-	        WRITE(8,'(/)')
+        	IF (lastkind.NE.-1) WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " "
+        WRITE(8,'(/)')
         WRITE(8,'("rk:")',ADVANCE='NO') ! Find real KINDs
         lastkind=SELECTED_REAL_KIND(1)
         DO ik=2,30
@@ -7197,8 +7197,8 @@ else
              ENDIF
              IF (k .LE. 0) EXIT
         ENDDO
-        IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " "
-	        WRITE(8,'(/)')
+        	IF (lastkind.NE.-1) WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " "
+        WRITE(8,'(/)')
         WRITE(8,'("rk:")',ADVANCE='NO') ! Find real KINDs
         lastkind=SELECTED_REAL_KIND(1)
         DO ik=2,30
diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c
index 89ea786..35dbc19 100644
--- a/fortran/src/H5match_types.c
+++ b/fortran/src/H5match_types.c
@@ -131,7 +131,7 @@ void writeTypedef(const char* c_typedef, const char* c_type, int size)
 void writeTypedefDefault(const char* c_typedef, int size)
 {
   assert(size %2 == 0);
-  fprintf(c_header, "typedef struct {c_%s_%u a; c_%s_%u b;} c_%s_%u\n", c_typedef, size / 2, c_typedef, size / 2, c_typedef, size);
+  fprintf(c_header, "typedef struct {c_%s_%u a; c_%s_%u b;} c_%s_%u;\n", c_typedef, size / 2, c_typedef, size / 2, c_typedef, size);
 }
 
 /* Create matching Fortran and C types by writing to both files */
diff --git a/m4/aclocal_fc.m4 b/m4/aclocal_fc.m4
index 65bb817..c8db176 100644
--- a/m4/aclocal_fc.m4
+++ b/m4/aclocal_fc.m4
@@ -308,8 +308,8 @@ AC_RUN_IFELSE([
              ENDIF
              IF (k .LE. 0) EXIT
         ENDDO
-        IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " "
-	dnl WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " "
+        dnl IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " "
+	IF (lastkind.NE.-1) WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " "
         WRITE(8,'(/)')
         WRITE(8,'("rk:")',ADVANCE='NO') ! Find real KINDs
         lastkind=SELECTED_REAL_KIND(1)
-- 
cgit v0.12