[svn-r21063] Description:

    Tweak make_vers script so that it indents preprocessor commands inside
#ifdefs, is more forgiving and informative about the input file's prefix, and
is better parameterized with the global variables at the beginning of the
script.  When major versions are branched from the trunk, the $max_idx value
should be the only value that needs to be changed in the version of the script
on the trunk.

    Changes to H5version.h file are just indention.

Tested on:
    Mac OS X/32 10.6.8 (amazon)
    (too minor to require h5committest)

2 files changed, 259 insertions, 225 deletions

diff --git a/bin/make_vers b/bin/make_vers
index 8541501..0bc3b62 100755
--- a/bin/make_vers
+++ b/bin/make_vers
@@ -2,6 +2,10 @@
 require 5.003;
 
 # Global settings
+# (The max_idx parameter is the only thing that needs to be changed when adding
+#       support for a new major release.  If support for a prior major release
+#       is added (like support for 1.4, etc), the min_sup_idx parameter will
+#       need to be decremented. - QAK)
 
 # Max. library "index" (0 = v1.0, 1 = 1.2, etc)
 $max_idx = 5;
@@ -9,6 +13,9 @@ $max_idx = 5;
 # Min. supported previous library version "index" (0 = v1.0, 1 = 1.2, etc)
 $min_sup_idx = 3;
 
+# Number of spaces to indent preprocessor commands inside ifdefs
+$indent = 2;
+
 #
 # Copyright by The HDF Group.
 # Copyright by the Board of Trustees of the University of Illinois.
@@ -82,13 +89,34 @@ sub print_startprotect ($$) {
 # Print check for conflicting version macro settings
 #
 sub print_checkoptions ($) {
-    my $fh = shift;
+    my $fh = shift;             # File handle for output file
+    my $curr_idx;               # Current API version index
 
     # Print the option checking
     print $fh "\n/* Issue error if contradicting macros have been defined. */\n";
-    print $fh "#if (defined(H5_USE_16_API) || defined(H5_USE_18_API)) && defined(H5_NO_DEPRECATED_SYMBOLS)\n";
-    print $fh "#error \"Can't choose old API versions when deprecated APIs are disabled\"\n";
-    print $fh "#endif /* (defined(H5_USE_16_API) || defined(H5_USE_18_API)) && defined(H5_NO_DEPRECATED_SYMBOLS) */\n";
+
+    # Print the #ifdef
+    print $fh "#if (";
+    for $curr_idx ($min_sup_idx .. ($max_idx - 1)) {
+        print $fh "defined(H5_USE_1", ($curr_idx * 2), "_API)";
+        if($curr_idx < ($max_idx - 1)) {
+            print $fh " || ";
+        }
+    }
+    print $fh ") && defined(H5_NO_DEPRECATED_SYMBOLS)\n";
+
+    # Print the error for bad API version chosen
+    print $fh ' ' x $indent, "#error \"Can't choose old API versions when deprecated APIs are disabled\"\n";
+
+    # Print the #endif
+    print $fh "#endif /* (";
+    for $curr_idx ($min_sup_idx .. ($max_idx - 1)) {
+        print $fh "defined(H5_USE_1", ($curr_idx * 2), "_API)";
+        if($curr_idx < ($max_idx - 1)) {
+            print $fh " || ";
+        }
+    }
+    print $fh ") && defined(H5_NO_DEPRECATED_SYMBOLS) */\n";
 }
 
 ##############################################################################
@@ -110,7 +138,7 @@ sub print_globalapivers ($) {
         # Print API version ifdef
         print $fh "#if defined(H5_USE_1", ($curr_idx * 2), "_API_DEFAULT) && !defined(H5_USE_1", ($curr_idx * 2), "_API)\n";
         # Print API version definition
-        print $fh "#define H5_USE_1", ($curr_idx * 2), "_API 1\n";
+        print $fh " " x $indent, "#define H5_USE_1", ($curr_idx * 2), "_API 1\n";
         # Print API version endif
         print $fh "#endif /* H5_USE_1", ($curr_idx * 2), "_API_DEFAULT && !H5_USE_1", ($curr_idx * 2), "_API */\n\n";
     }
@@ -127,7 +155,7 @@ sub print_globalapivers ($) {
         print $fh "/*************/\n";
         for $name (sort keys %{$func_vers[$curr_idx]}) {
             print $fh "\n#if !defined(", $name, "_vers)\n";
-            print $fh  "#define ", $name, "_vers $func_vers[$curr_idx]{$name}\n";
+            print $fh  " " x $indent, "#define ", $name, "_vers $func_vers[$curr_idx]{$name}\n";
             print $fh  "#endif /* !defined(", $name, "_vers) */\n";
         }
 
@@ -138,7 +166,7 @@ sub print_globalapivers ($) {
         print $fh "/************/\n";
         for $name (sort keys %{$type_vers[$curr_idx]}) {
             print $fh "\n#if !defined(", $name, "_t_vers)\n";
-            print $fh  "#define ", $name, "_t_vers $type_vers[$curr_idx]{$name}\n";
+            print $fh  " " x $indent, "#define ", $name, "_t_vers $type_vers[$curr_idx]{$name}\n";
             print $fh  "#endif /* !defined(", $name, "_t_vers) */\n";
         }
 
@@ -180,25 +208,25 @@ sub print_defaultapivers ($) {
 
         # Set up default/latest version name mapping
         print $fh "\n#if !defined($curr_vers_name) || $curr_vers_name == $curr_vers\n";
-        print $fh "#ifndef $curr_vers_name\n";
-        print $fh "#define $curr_vers_name $curr_vers\n";
-        print $fh "#endif /* $curr_vers_name */\n";
-        print $fh "#define $curr_name $curr_name$curr_vers\n";
+        print $fh " " x $indent, "#ifndef $curr_vers_name\n";
+        print $fh " " x ($indent * 2), "#define $curr_vers_name $curr_vers\n";
+        print $fh " " x $indent, "#endif /* $curr_vers_name */\n";
+        print $fh " " x $indent, "#define $curr_name $curr_name$curr_vers\n";
 
         # Print function's dependent parameter types
         foreach(sort(@param_list)) {
-            print $fh "#define ${_}_t $_${curr_vers}_t\n";
+            print $fh " " x $indent, "#define ${_}_t $_${curr_vers}_t\n";
         }
 
         # Loop to print earlier version name mappings
         $curr_vers--;
         while($curr_vers > 0) {
             print $fh "#elif $curr_vers_name == $curr_vers\n";
-            print $fh "#define $curr_name $curr_name$curr_vers\n";
+            print $fh " " x $indent, "#define $curr_name $curr_name$curr_vers\n";
 
             # Print function's dependent parameter types
             foreach(sort(@param_list)) {
-                print $fh "#define ${_}_t $_${curr_vers}_t\n";
+                print $fh " " x $indent, "#define ${_}_t $_${curr_vers}_t\n";
             }
 
             $curr_vers--;
@@ -206,7 +234,7 @@ sub print_defaultapivers ($) {
 
         # Finish up with error for unknown version and endif
         print $fh "#else /* $curr_vers_name */\n";
-        print $fh "#error \"$curr_vers_name set to invalid value\"\n";
+        print $fh " " x $indent, "#error \"$curr_vers_name set to invalid value\"\n";
         print $fh "#endif /* $curr_vers_name */\n";
     }
 
@@ -224,22 +252,22 @@ sub print_defaultapivers ($) {
 
         # Set up default/latest version name mapping
         print $fh "\n#if !defined($curr_vers_name) || $curr_vers_name == $curr_vers\n";
-        print $fh "#ifndef $curr_vers_name\n";
-        print $fh "#define $curr_vers_name $curr_vers\n";
-        print $fh "#endif /* $curr_vers_name */\n";
-        print $fh "#define ${curr_name}_t $curr_name${curr_vers}_t\n";
+        print $fh " " x $indent, "#ifndef $curr_vers_name\n";
+        print $fh " " x ($indent * 2), "#define $curr_vers_name $curr_vers\n";
+        print $fh " " x $indent, "#endif /* $curr_vers_name */\n";
+        print $fh " " x $indent, "#define ${curr_name}_t $curr_name${curr_vers}_t\n";
 
         # Loop to print earlier version name mappings
         $curr_vers--;
         while($curr_vers > 0) {
             print $fh "#elif $curr_vers_name == $curr_vers\n";
-            print $fh "#define ${curr_name}_t $curr_name${curr_vers}_t\n";
+            print $fh " " x $indent, "#define ${curr_name}_t $curr_name${curr_vers}_t\n";
             $curr_vers--;
         }
 
         # Finish up with error for unknown version and endif
         print $fh "#else /* $curr_vers_name */\n";
-        print $fh "#error \"$curr_vers_name set to invalid value\"\n";
+        print $fh " " x $indent, "#error \"$curr_vers_name set to invalid value\"\n";
         print $fh "#endif /* $curr_vers_name */\n\n";
     }
 }
@@ -436,7 +464,13 @@ for $file (@ARGV) {
     my $prefix;         # Local prefix for generated files
 
 #print "file = '$file'\n";
-    ($prefix) = ($file =~ /(^.*\/)/);
+    # Check for directory prefix on input file
+    if($file =~ /\//) {
+        ($prefix) = ($file =~ /(^.*\/)/);
+    }
+    else {
+        $prefix = "";
+    }
 #print "prefix = '$prefix'\n";
     # Read in the entire file
     open SOURCE, $file or die "$file: $!\n";
@@ -450,7 +484,7 @@ for $file (@ARGV) {
     close SOURCE;
   
     # Create header files
-    print "Generating 'H5version.h'\n";
+    print "Generating '", $prefix, "H5version.h'\n";
     create_public($prefix);
 
 #for $name (sort keys %functions) {
diff --git a/src/H5version.h b/src/H5version.h
index 296768e..a885b0f 100644
--- a/src/H5version.h
+++ b/src/H5version.h
@@ -22,7 +22,7 @@
 
 /* Issue error if contradicting macros have been defined. */
 #if (defined(H5_USE_16_API) || defined(H5_USE_18_API)) && defined(H5_NO_DEPRECATED_SYMBOLS)
-#error "Can't choose old API versions when deprecated APIs are disabled"
+  #error "Can't choose old API versions when deprecated APIs are disabled"
 #endif /* (defined(H5_USE_16_API) || defined(H5_USE_18_API)) && defined(H5_NO_DEPRECATED_SYMBOLS) */
 
 
@@ -33,11 +33,11 @@
  *      API symbol, the individual API version macro takes priority.
  */
 #if defined(H5_USE_16_API_DEFAULT) && !defined(H5_USE_16_API)
-#define H5_USE_16_API 1
+  #define H5_USE_16_API 1
 #endif /* H5_USE_16_API_DEFAULT && !H5_USE_16_API */
 
 #if defined(H5_USE_18_API_DEFAULT) && !defined(H5_USE_18_API)
-#define H5_USE_18_API 1
+  #define H5_USE_18_API 1
 #endif /* H5_USE_18_API_DEFAULT && !H5_USE_18_API */
 
 
@@ -48,87 +48,87 @@
 /*************/
 
 #if !defined(H5Acreate_vers)
-#define H5Acreate_vers 1
+  #define H5Acreate_vers 1
 #endif /* !defined(H5Acreate_vers) */
 
 #if !defined(H5Aiterate_vers)
-#define H5Aiterate_vers 1
+  #define H5Aiterate_vers 1
 #endif /* !defined(H5Aiterate_vers) */
 
 #if !defined(H5Dcreate_vers)
-#define H5Dcreate_vers 1
+  #define H5Dcreate_vers 1
 #endif /* !defined(H5Dcreate_vers) */
 
 #if !defined(H5Dopen_vers)
-#define H5Dopen_vers 1
+  #define H5Dopen_vers 1
 #endif /* !defined(H5Dopen_vers) */
 
 #if !defined(H5Eclear_vers)
-#define H5Eclear_vers 1
+  #define H5Eclear_vers 1
 #endif /* !defined(H5Eclear_vers) */
 
 #if !defined(H5Eget_auto_vers)
-#define H5Eget_auto_vers 1
+  #define H5Eget_auto_vers 1
 #endif /* !defined(H5Eget_auto_vers) */
 
 #if !defined(H5Eprint_vers)
-#define H5Eprint_vers 1
+  #define H5Eprint_vers 1
 #endif /* !defined(H5Eprint_vers) */
 
 #if !defined(H5Epush_vers)
-#define H5Epush_vers 1
+  #define H5Epush_vers 1
 #endif /* !defined(H5Epush_vers) */
 
 #if !defined(H5Eset_auto_vers)
-#define H5Eset_auto_vers 1
+  #define H5Eset_auto_vers 1
 #endif /* !defined(H5Eset_auto_vers) */
 
 #if !defined(H5Ewalk_vers)
-#define H5Ewalk_vers 1
+  #define H5Ewalk_vers 1
 #endif /* !defined(H5Ewalk_vers) */
 
 #if !defined(H5Gcreate_vers)
-#define H5Gcreate_vers 1
+  #define H5Gcreate_vers 1
 #endif /* !defined(H5Gcreate_vers) */
 
 #if !defined(H5Gopen_vers)
-#define H5Gopen_vers 1
+  #define H5Gopen_vers 1
 #endif /* !defined(H5Gopen_vers) */
 
 #if !defined(H5Pget_filter_vers)
-#define H5Pget_filter_vers 1
+  #define H5Pget_filter_vers 1
 #endif /* !defined(H5Pget_filter_vers) */
 
 #if !defined(H5Pget_filter_by_id_vers)
-#define H5Pget_filter_by_id_vers 1
+  #define H5Pget_filter_by_id_vers 1
 #endif /* !defined(H5Pget_filter_by_id_vers) */
 
 #if !defined(H5Pinsert_vers)
-#define H5Pinsert_vers 1
+  #define H5Pinsert_vers 1
 #endif /* !defined(H5Pinsert_vers) */
 
 #if !defined(H5Pregister_vers)
-#define H5Pregister_vers 1
+  #define H5Pregister_vers 1
 #endif /* !defined(H5Pregister_vers) */
 
 #if !defined(H5Rget_obj_type_vers)
-#define H5Rget_obj_type_vers 1
+  #define H5Rget_obj_type_vers 1
 #endif /* !defined(H5Rget_obj_type_vers) */
 
 #if !defined(H5Tarray_create_vers)
-#define H5Tarray_create_vers 1
+  #define H5Tarray_create_vers 1
 #endif /* !defined(H5Tarray_create_vers) */
 
 #if !defined(H5Tcommit_vers)
-#define H5Tcommit_vers 1
+  #define H5Tcommit_vers 1
 #endif /* !defined(H5Tcommit_vers) */
 
 #if !defined(H5Tget_array_dims_vers)
-#define H5Tget_array_dims_vers 1
+  #define H5Tget_array_dims_vers 1
 #endif /* !defined(H5Tget_array_dims_vers) */
 
 #if !defined(H5Topen_vers)
-#define H5Topen_vers 1
+  #define H5Topen_vers 1
 #endif /* !defined(H5Topen_vers) */
 
 /************/
@@ -136,11 +136,11 @@
 /************/
 
 #if !defined(H5E_auto_t_vers)
-#define H5E_auto_t_vers 1
+  #define H5E_auto_t_vers 1
 #endif /* !defined(H5E_auto_t_vers) */
 
 #if !defined(H5Z_class_t_vers)
-#define H5Z_class_t_vers 1
+  #define H5Z_class_t_vers 1
 #endif /* !defined(H5Z_class_t_vers) */
 
 #endif /* H5_USE_16_API */
@@ -152,91 +152,91 @@
 /*************/
 
 #if !defined(H5Acreate_vers)
-#define H5Acreate_vers 2
+  #define H5Acreate_vers 2
 #endif /* !defined(H5Acreate_vers) */
 
 #if !defined(H5Aiterate_vers)
-#define H5Aiterate_vers 2
+  #define H5Aiterate_vers 2
 #endif /* !defined(H5Aiterate_vers) */
 
 #if !defined(H5Dcreate_vers)
-#define H5Dcreate_vers 2
+  #define H5Dcreate_vers 2
 #endif /* !defined(H5Dcreate_vers) */
 
 #if !defined(H5Dopen_vers)
-#define H5Dopen_vers 2
+  #define H5Dopen_vers 2
 #endif /* !defined(H5Dopen_vers) */
 
 #if !defined(H5Eclear_vers)
-#define H5Eclear_vers 2
+  #define H5Eclear_vers 2
 #endif /* !defined(H5Eclear_vers) */
 
 #if !defined(H5Eget_auto_vers)
-#define H5Eget_auto_vers 2
+  #define H5Eget_auto_vers 2
 #endif /* !defined(H5Eget_auto_vers) */
 
 #if !defined(H5Eprint_vers)
-#define H5Eprint_vers 2
+  #define H5Eprint_vers 2
 #endif /* !defined(H5Eprint_vers) */
 
 #if !defined(H5Epush_vers)
-#define H5Epush_vers 2
+  #define H5Epush_vers 2
 #endif /* !defined(H5Epush_vers) */
 
 #if !defined(H5Eset_auto_vers)
-#define H5Eset_auto_vers 2
+  #define H5Eset_auto_vers 2
 #endif /* !defined(H5Eset_auto_vers) */
 
 #if !defined(H5Ewalk_vers)
-#define H5Ewalk_vers 2
+  #define H5Ewalk_vers 2
 #endif /* !defined(H5Ewalk_vers) */
 
 #if !defined(H5Fget_info_vers)
-#define H5Fget_info_vers 1
+  #define H5Fget_info_vers 1
 #endif /* !defined(H5Fget_info_vers) */
 
 #if !defined(H5Gcreate_vers)
-#define H5Gcreate_vers 2
+  #define H5Gcreate_vers 2
 #endif /* !defined(H5Gcreate_vers) */
 
 #if !defined(H5Gopen_vers)
-#define H5Gopen_vers 2
+  #define H5Gopen_vers 2
 #endif /* !defined(H5Gopen_vers) */
 
 #if !defined(H5Pget_filter_vers)
-#define H5Pget_filter_vers 2
+  #define H5Pget_filter_vers 2
 #endif /* !defined(H5Pget_filter_vers) */
 
 #if !defined(H5Pget_filter_by_id_vers)
-#define H5Pget_filter_by_id_vers 2
+  #define H5Pget_filter_by_id_vers 2
 #endif /* !defined(H5Pget_filter_by_id_vers) */
 
 #if !defined(H5Pinsert_vers)
-#define H5Pinsert_vers 2
+  #define H5Pinsert_vers 2
 #endif /* !defined(H5Pinsert_vers) */
 
 #if !defined(H5Pregister_vers)
-#define H5Pregister_vers 2
+  #define H5Pregister_vers 2
 #endif /* !defined(H5Pregister_vers) */
 
 #if !defined(H5Rget_obj_type_vers)
-#define H5Rget_obj_type_vers 2
+  #define H5Rget_obj_type_vers 2
 #endif /* !defined(H5Rget_obj_type_vers) */
 
 #if !defined(H5Tarray_create_vers)
-#define H5Tarray_create_vers 2
+  #define H5Tarray_create_vers 2
 #endif /* !defined(H5Tarray_create_vers) */
 
 #if !defined(H5Tcommit_vers)
-#define H5Tcommit_vers 2
+  #define H5Tcommit_vers 2
 #endif /* !defined(H5Tcommit_vers) */
 
 #if !defined(H5Tget_array_dims_vers)
-#define H5Tget_array_dims_vers 2
+  #define H5Tget_array_dims_vers 2
 #endif /* !defined(H5Tget_array_dims_vers) */
 
 #if !defined(H5Topen_vers)
-#define H5Topen_vers 2
+  #define H5Topen_vers 2
 #endif /* !defined(H5Topen_vers) */
 
 /************/
@@ -244,11 +244,11 @@
 /************/
 
 #if !defined(H5E_auto_t_vers)
-#define H5E_auto_t_vers 2
+  #define H5E_auto_t_vers 2
 #endif /* !defined(H5E_auto_t_vers) */
 
 #if !defined(H5Z_class_t_vers)
-#define H5Z_class_t_vers 2
+  #define H5Z_class_t_vers 2
 #endif /* !defined(H5Z_class_t_vers) */
 
 #endif /* H5_USE_18_API */
@@ -265,253 +265,253 @@
 /*************/
 
 #if !defined(H5Acreate_vers) || H5Acreate_vers == 2
-#ifndef H5Acreate_vers
-#define H5Acreate_vers 2
-#endif /* H5Acreate_vers */
-#define H5Acreate H5Acreate2
+  #ifndef H5Acreate_vers
+    #define H5Acreate_vers 2
+  #endif /* H5Acreate_vers */
+  #define H5Acreate H5Acreate2
 #elif H5Acreate_vers == 1
-#define H5Acreate H5Acreate1
+  #define H5Acreate H5Acreate1
 #else /* H5Acreate_vers */
-#error "H5Acreate_vers set to invalid value"
+  #error "H5Acreate_vers set to invalid value"
 #endif /* H5Acreate_vers */
 
 #if !defined(H5Aiterate_vers) || H5Aiterate_vers == 2
-#ifndef H5Aiterate_vers
-#define H5Aiterate_vers 2
-#endif /* H5Aiterate_vers */
-#define H5Aiterate H5Aiterate2
-#define H5A_operator_t H5A_operator2_t
+  #ifndef H5Aiterate_vers
+    #define H5Aiterate_vers 2
+  #endif /* H5Aiterate_vers */
+  #define H5Aiterate H5Aiterate2
+  #define H5A_operator_t H5A_operator2_t
 #elif H5Aiterate_vers == 1
-#define H5Aiterate H5Aiterate1
-#define H5A_operator_t H5A_operator1_t
+  #define H5Aiterate H5Aiterate1
+  #define H5A_operator_t H5A_operator1_t
 #else /* H5Aiterate_vers */
-#error "H5Aiterate_vers set to invalid value"
+  #error "H5Aiterate_vers set to invalid value"
 #endif /* H5Aiterate_vers */
 
 #if !defined(H5Dcreate_vers) || H5Dcreate_vers == 2
-#ifndef H5Dcreate_vers
-#define H5Dcreate_vers 2
-#endif /* H5Dcreate_vers */
-#define H5Dcreate H5Dcreate2
+  #ifndef H5Dcreate_vers
+    #define H5Dcreate_vers 2
+  #endif /* H5Dcreate_vers */
+  #define H5Dcreate H5Dcreate2
 #elif H5Dcreate_vers == 1
-#define H5Dcreate H5Dcreate1
+  #define H5Dcreate H5Dcreate1
 #else /* H5Dcreate_vers */
-#error "H5Dcreate_vers set to invalid value"
+  #error "H5Dcreate_vers set to invalid value"
 #endif /* H5Dcreate_vers */
 
 #if !defined(H5Dopen_vers) || H5Dopen_vers == 2
-#ifndef H5Dopen_vers
-#define H5Dopen_vers 2
-#endif /* H5Dopen_vers */
-#define H5Dopen H5Dopen2
+  #ifndef H5Dopen_vers
+    #define H5Dopen_vers 2
+  #endif /* H5Dopen_vers */
+  #define H5Dopen H5Dopen2
 #elif H5Dopen_vers == 1
-#define H5Dopen H5Dopen1
+  #define H5Dopen H5Dopen1
 #else /* H5Dopen_vers */
-#error "H5Dopen_vers set to invalid value"
+  #error "H5Dopen_vers set to invalid value"
 #endif /* H5Dopen_vers */
 
 #if !defined(H5Eclear_vers) || H5Eclear_vers == 2
-#ifndef H5Eclear_vers
-#define H5Eclear_vers 2
-#endif /* H5Eclear_vers */
-#define H5Eclear H5Eclear2
+  #ifndef H5Eclear_vers
+    #define H5Eclear_vers 2
+  #endif /* H5Eclear_vers */
+  #define H5Eclear H5Eclear2
 #elif H5Eclear_vers == 1
-#define H5Eclear H5Eclear1
+  #define H5Eclear H5Eclear1
 #else /* H5Eclear_vers */
-#error "H5Eclear_vers set to invalid value"
+  #error "H5Eclear_vers set to invalid value"
 #endif /* H5Eclear_vers */
 
 #if !defined(H5Eget_auto_vers) || H5Eget_auto_vers == 2
-#ifndef H5Eget_auto_vers
-#define H5Eget_auto_vers 2
-#endif /* H5Eget_auto_vers */
-#define H5Eget_auto H5Eget_auto2
+  #ifndef H5Eget_auto_vers
+    #define H5Eget_auto_vers 2
+  #endif /* H5Eget_auto_vers */
+  #define H5Eget_auto H5Eget_auto2
 #elif H5Eget_auto_vers == 1
-#define H5Eget_auto H5Eget_auto1
+  #define H5Eget_auto H5Eget_auto1
 #else /* H5Eget_auto_vers */
-#error "H5Eget_auto_vers set to invalid value"
+  #error "H5Eget_auto_vers set to invalid value"
 #endif /* H5Eget_auto_vers */
 
 #if !defined(H5Eprint_vers) || H5Eprint_vers == 2
-#ifndef H5Eprint_vers
-#define H5Eprint_vers 2
-#endif /* H5Eprint_vers */
-#define H5Eprint H5Eprint2
+  #ifndef H5Eprint_vers
+    #define H5Eprint_vers 2
+  #endif /* H5Eprint_vers */
+  #define H5Eprint H5Eprint2
 #elif H5Eprint_vers == 1
-#define H5Eprint H5Eprint1
+  #define H5Eprint H5Eprint1
 #else /* H5Eprint_vers */
-#error "H5Eprint_vers set to invalid value"
+  #error "H5Eprint_vers set to invalid value"
 #endif /* H5Eprint_vers */
 
 #if !defined(H5Epush_vers) || H5Epush_vers == 2
-#ifndef H5Epush_vers
-#define H5Epush_vers 2
-#endif /* H5Epush_vers */
-#define H5Epush H5Epush2
+  #ifndef H5Epush_vers
+    #define H5Epush_vers 2
+  #endif /* H5Epush_vers */
+  #define H5Epush H5Epush2
 #elif H5Epush_vers == 1
-#define H5Epush H5Epush1
+  #define H5Epush H5Epush1
 #else /* H5Epush_vers */
-#error "H5Epush_vers set to invalid value"
+  #error "H5Epush_vers set to invalid value"
 #endif /* H5Epush_vers */
 
 #if !defined(H5Eset_auto_vers) || H5Eset_auto_vers == 2
-#ifndef H5Eset_auto_vers
-#define H5Eset_auto_vers 2
-#endif /* H5Eset_auto_vers */
-#define H5Eset_auto H5Eset_auto2
+  #ifndef H5Eset_auto_vers
+    #define H5Eset_auto_vers 2
+  #endif /* H5Eset_auto_vers */
+  #define H5Eset_auto H5Eset_auto2
 #elif H5Eset_auto_vers == 1
-#define H5Eset_auto H5Eset_auto1
+  #define H5Eset_auto H5Eset_auto1
 #else /* H5Eset_auto_vers */
-#error "H5Eset_auto_vers set to invalid value"
+  #error "H5Eset_auto_vers set to invalid value"
 #endif /* H5Eset_auto_vers */
 
 #if !defined(H5Ewalk_vers) || H5Ewalk_vers == 2
-#ifndef H5Ewalk_vers
-#define H5Ewalk_vers 2
-#endif /* H5Ewalk_vers */
-#define H5Ewalk H5Ewalk2
-#define H5E_error_t H5E_error2_t
-#define H5E_walk_t H5E_walk2_t
+  #ifndef H5Ewalk_vers
+    #define H5Ewalk_vers 2
+  #endif /* H5Ewalk_vers */
+  #define H5Ewalk H5Ewalk2
+  #define H5E_error_t H5E_error2_t
+  #define H5E_walk_t H5E_walk2_t
 #elif H5Ewalk_vers == 1
-#define H5Ewalk H5Ewalk1
-#define H5E_error_t H5E_error1_t
-#define H5E_walk_t H5E_walk1_t
+  #define H5Ewalk H5Ewalk1
+  #define H5E_error_t H5E_error1_t
+  #define H5E_walk_t H5E_walk1_t
 #else /* H5Ewalk_vers */
-#error "H5Ewalk_vers set to invalid value"
+  #error "H5Ewalk_vers set to invalid value"
 #endif /* H5Ewalk_vers */
 
 #if !defined(H5Fget_info_vers) || H5Fget_info_vers == 2
-#ifndef H5Fget_info_vers
-#define H5Fget_info_vers 2
-#endif /* H5Fget_info_vers */
-#define H5Fget_info H5Fget_info2
-#define H5F_info_t H5F_info2_t
+  #ifndef H5Fget_info_vers
+    #define H5Fget_info_vers 2
+  #endif /* H5Fget_info_vers */
+  #define H5Fget_info H5Fget_info2
+  #define H5F_info_t H5F_info2_t
 #elif H5Fget_info_vers == 1
-#define H5Fget_info H5Fget_info1
-#define H5F_info_t H5F_info1_t
+  #define H5Fget_info H5Fget_info1
+  #define H5F_info_t H5F_info1_t
 #else /* H5Fget_info_vers */
-#error "H5Fget_info_vers set to invalid value"
+  #error "H5Fget_info_vers set to invalid value"
 #endif /* H5Fget_info_vers */
 
 #if !defined(H5Gcreate_vers) || H5Gcreate_vers == 2
-#ifndef H5Gcreate_vers
-#define H5Gcreate_vers 2
-#endif /* H5Gcreate_vers */
-#define H5Gcreate H5Gcreate2
+  #ifndef H5Gcreate_vers
+    #define H5Gcreate_vers 2
+  #endif /* H5Gcreate_vers */
+  #define H5Gcreate H5Gcreate2
 #elif H5Gcreate_vers == 1
-#define H5Gcreate H5Gcreate1
+  #define H5Gcreate H5Gcreate1
 #else /* H5Gcreate_vers */
-#error "H5Gcreate_vers set to invalid value"
+  #error "H5Gcreate_vers set to invalid value"
 #endif /* H5Gcreate_vers */
 
 #if !defined(H5Gopen_vers) || H5Gopen_vers == 2
-#ifndef H5Gopen_vers
-#define H5Gopen_vers 2
-#endif /* H5Gopen_vers */
-#define H5Gopen H5Gopen2
+  #ifndef H5Gopen_vers
+    #define H5Gopen_vers 2
+  #endif /* H5Gopen_vers */
+  #define H5Gopen H5Gopen2
 #elif H5Gopen_vers == 1
-#define H5Gopen H5Gopen1
+  #define H5Gopen H5Gopen1
 #else /* H5Gopen_vers */
-#error "H5Gopen_vers set to invalid value"
+  #error "H5Gopen_vers set to invalid value"
 #endif /* H5Gopen_vers */
 
 #if !defined(H5Pget_filter_vers) || H5Pget_filter_vers == 2
-#ifndef H5Pget_filter_vers
-#define H5Pget_filter_vers 2
-#endif /* H5Pget_filter_vers */
-#define H5Pget_filter H5Pget_filter2
+  #ifndef H5Pget_filter_vers
+    #define H5Pget_filter_vers 2
+  #endif /* H5Pget_filter_vers */
+  #define H5Pget_filter H5Pget_filter2
 #elif H5Pget_filter_vers == 1
-#define H5Pget_filter H5Pget_filter1
+  #define H5Pget_filter H5Pget_filter1
 #else /* H5Pget_filter_vers */
-#error "H5Pget_filter_vers set to invalid value"
+  #error "H5Pget_filter_vers set to invalid value"
 #endif /* H5Pget_filter_vers */
 
 #if !defined(H5Pget_filter_by_id_vers) || H5Pget_filter_by_id_vers == 2
-#ifndef H5Pget_filter_by_id_vers
-#define H5Pget_filter_by_id_vers 2
-#endif /* H5Pget_filter_by_id_vers */
-#define H5Pget_filter_by_id H5Pget_filter_by_id2
+  #ifndef H5Pget_filter_by_id_vers
+    #define H5Pget_filter_by_id_vers 2
+  #endif /* H5Pget_filter_by_id_vers */
+  #define H5Pget_filter_by_id H5Pget_filter_by_id2
 #elif H5Pget_filter_by_id_vers == 1
-#define H5Pget_filter_by_id H5Pget_filter_by_id1
+  #define H5Pget_filter_by_id H5Pget_filter_by_id1
 #else /* H5Pget_filter_by_id_vers */
-#error "H5Pget_filter_by_id_vers set to invalid value"
+  #error "H5Pget_filter_by_id_vers set to invalid value"
 #endif /* H5Pget_filter_by_id_vers */
 
 #if !defined(H5Pinsert_vers) || H5Pinsert_vers == 2
-#ifndef H5Pinsert_vers
-#define H5Pinsert_vers 2
-#endif /* H5Pinsert_vers */
-#define H5Pinsert H5Pinsert2
+  #ifndef H5Pinsert_vers
+    #define H5Pinsert_vers 2
+  #endif /* H5Pinsert_vers */
+  #define H5Pinsert H5Pinsert2
 #elif H5Pinsert_vers == 1
-#define H5Pinsert H5Pinsert1
+  #define H5Pinsert H5Pinsert1
 #else /* H5Pinsert_vers */
-#error "H5Pinsert_vers set to invalid value"
+  #error "H5Pinsert_vers set to invalid value"
 #endif /* H5Pinsert_vers */
 
 #if !defined(H5Pregister_vers) || H5Pregister_vers == 2
-#ifndef H5Pregister_vers
-#define H5Pregister_vers 2
-#endif /* H5Pregister_vers */
-#define H5Pregister H5Pregister2
+  #ifndef H5Pregister_vers
+    #define H5Pregister_vers 2
+  #endif /* H5Pregister_vers */
+  #define H5Pregister H5Pregister2
 #elif H5Pregister_vers == 1
-#define H5Pregister H5Pregister1
+  #define H5Pregister H5Pregister1
 #else /* H5Pregister_vers */
-#error "H5Pregister_vers set to invalid value"
+  #error "H5Pregister_vers set to invalid value"
 #endif /* H5Pregister_vers */
 
 #if !defined(H5Rget_obj_type_vers) || H5Rget_obj_type_vers == 2
-#ifndef H5Rget_obj_type_vers
-#define H5Rget_obj_type_vers 2
-#endif /* H5Rget_obj_type_vers */
-#define H5Rget_obj_type H5Rget_obj_type2
+  #ifndef H5Rget_obj_type_vers
+    #define H5Rget_obj_type_vers 2
+  #endif /* H5Rget_obj_type_vers */
+  #define H5Rget_obj_type H5Rget_obj_type2
 #elif H5Rget_obj_type_vers == 1
-#define H5Rget_obj_type H5Rget_obj_type1
+  #define H5Rget_obj_type H5Rget_obj_type1
 #else /* H5Rget_obj_type_vers */
-#error "H5Rget_obj_type_vers set to invalid value"
+  #error "H5Rget_obj_type_vers set to invalid value"
 #endif /* H5Rget_obj_type_vers */
 
 #if !defined(H5Tarray_create_vers) || H5Tarray_create_vers == 2
-#ifndef H5Tarray_create_vers
-#define H5Tarray_create_vers 2
-#endif /* H5Tarray_create_vers */
-#define H5Tarray_create H5Tarray_create2
+  #ifndef H5Tarray_create_vers
+    #define H5Tarray_create_vers 2
+  #endif /* H5Tarray_create_vers */
+  #define H5Tarray_create H5Tarray_create2
 #elif H5Tarray_create_vers == 1
-#define H5Tarray_create H5Tarray_create1
+  #define H5Tarray_create H5Tarray_create1
 #else /* H5Tarray_create_vers */
-#error "H5Tarray_create_vers set to invalid value"
+  #error "H5Tarray_create_vers set to invalid value"
 #endif /* H5Tarray_create_vers */
 
 #if !defined(H5Tcommit_vers) || H5Tcommit_vers == 2
-#ifndef H5Tcommit_vers
-#define H5Tcommit_vers 2
-#endif /* H5Tcommit_vers */
-#define H5Tcommit H5Tcommit2
+  #ifndef H5Tcommit_vers
+    #define H5Tcommit_vers 2
+  #endif /* H5Tcommit_vers */
+  #define H5Tcommit H5Tcommit2
 #elif H5Tcommit_vers == 1
-#define H5Tcommit H5Tcommit1
+  #define H5Tcommit H5Tcommit1
 #else /* H5Tcommit_vers */
-#error "H5Tcommit_vers set to invalid value"
+  #error "H5Tcommit_vers set to invalid value"
 #endif /* H5Tcommit_vers */
 
 #if !defined(H5Tget_array_dims_vers) || H5Tget_array_dims_vers == 2
-#ifndef H5Tget_array_dims_vers
-#define H5Tget_array_dims_vers 2
-#endif /* H5Tget_array_dims_vers */
-#define H5Tget_array_dims H5Tget_array_dims2
+  #ifndef H5Tget_array_dims_vers
+    #define H5Tget_array_dims_vers 2
+  #endif /* H5Tget_array_dims_vers */
+  #define H5Tget_array_dims H5Tget_array_dims2
 #elif H5Tget_array_dims_vers == 1
-#define H5Tget_array_dims H5Tget_array_dims1
+  #define H5Tget_array_dims H5Tget_array_dims1
 #else /* H5Tget_array_dims_vers */
-#error "H5Tget_array_dims_vers set to invalid value"
+  #error "H5Tget_array_dims_vers set to invalid value"
 #endif /* H5Tget_array_dims_vers */
 
 #if !defined(H5Topen_vers) || H5Topen_vers == 2
-#ifndef H5Topen_vers
-#define H5Topen_vers 2
-#endif /* H5Topen_vers */
-#define H5Topen H5Topen2
+  #ifndef H5Topen_vers
+    #define H5Topen_vers 2
+  #endif /* H5Topen_vers */
+  #define H5Topen H5Topen2
 #elif H5Topen_vers == 1
-#define H5Topen H5Topen1
+  #define H5Topen H5Topen1
 #else /* H5Topen_vers */
-#error "H5Topen_vers set to invalid value"
+  #error "H5Topen_vers set to invalid value"
 #endif /* H5Topen_vers */
 
 /************/
@@ -519,26 +519,26 @@
 /************/
 
 #if !defined(H5E_auto_t_vers) || H5E_auto_t_vers == 2
-#ifndef H5E_auto_t_vers
-#define H5E_auto_t_vers 2
-#endif /* H5E_auto_t_vers */
-#define H5E_auto_t H5E_auto2_t
+  #ifndef H5E_auto_t_vers
+    #define H5E_auto_t_vers 2
+  #endif /* H5E_auto_t_vers */
+  #define H5E_auto_t H5E_auto2_t
 #elif H5E_auto_t_vers == 1
-#define H5E_auto_t H5E_auto1_t
+  #define H5E_auto_t H5E_auto1_t
 #else /* H5E_auto_t_vers */
-#error "H5E_auto_t_vers set to invalid value"
+  #error "H5E_auto_t_vers set to invalid value"
 #endif /* H5E_auto_t_vers */
 
 
 #if !defined(H5Z_class_t_vers) || H5Z_class_t_vers == 2
-#ifndef H5Z_class_t_vers
-#define H5Z_class_t_vers 2
-#endif /* H5Z_class_t_vers */
-#define H5Z_class_t H5Z_class2_t
+  #ifndef H5Z_class_t_vers
+    #define H5Z_class_t_vers 2
+  #endif /* H5Z_class_t_vers */
+  #define H5Z_class_t H5Z_class2_t
 #elif H5Z_class_t_vers == 1
-#define H5Z_class_t H5Z_class1_t
+  #define H5Z_class_t H5Z_class1_t
 #else /* H5Z_class_t_vers */
-#error "H5Z_class_t_vers set to invalid value"
+  #error "H5Z_class_t_vers set to invalid value"
 #endif /* H5Z_class_t_vers */
 
 #endif /* H5version_H */