[svn-r14108] Description:

Make version macro for typedefs closer to version macro for API
functions.

Tested on:
        FreeBSD/32 6.2 (duty)
        FreeBSD/64 6.2 (liberty)
        Linux/32 2.6 (kagiso)
        Linux/64 2.6 (smirom)
        Solaris/32 5.10 (linew)
This commit is contained in:
Quincey Koziol 2007-08-23 17:40:22 -05:00
parent 63eb5b9ebb
commit 14ce8811f7
2 changed files with 12 additions and 12 deletions

View File

@ -128,9 +128,9 @@ sub print_globalapivers ($) {
print $fh "/* Typedefs */\n";
print $fh "/************/\n";
for $name (sort keys %{$type_vers[$curr_idx]}) {
print $fh "\n#if !defined(", $name, "_vers)\n";
print $fh "#define ", $name, "_vers $type_vers[$curr_idx]{$name}\n";
print $fh "#endif /* !defined(", $name, "_vers) */\n";
print $fh "\n#if !defined(", $name, "_t_vers)\n";
print $fh "#define ", $name, "_t_vers $type_vers[$curr_idx]{$name}\n";
print $fh "#endif /* !defined(", $name, "_t_vers) */\n";
}
# Print API version endif
@ -207,7 +207,7 @@ sub print_defaultapivers ($) {
my $curr_vers; # Version of function
# Set up variables for later use
$curr_vers_name = $curr_name . "_vers";
$curr_vers_name = $curr_name . "_t_vers";
$curr_vers = $typedefs{$curr_name};
# Set up default/latest version name mapping

View File

@ -70,9 +70,9 @@
/* Typedefs */
/************/
#if !defined(H5E_auto_vers)
#define H5E_auto_vers 1
#endif /* !defined(H5E_auto_vers) */
#if !defined(H5E_auto_t_vers)
#define H5E_auto_t_vers 1
#endif /* !defined(H5E_auto_t_vers) */
#endif /* H5_USE_16_API */
@ -151,13 +151,13 @@
/* Typedefs */
/************/
#if !defined(H5E_auto_vers) || H5E_auto_vers == 2
#if !defined(H5E_auto_t_vers) || H5E_auto_t_vers == 2
#define H5E_auto_t H5E_auto2_t
#elif H5E_auto_vers == 1
#elif H5E_auto_t_vers == 1
#define H5E_auto_t H5E_auto1_t
#else /* H5E_auto_vers */
#error "H5E_auto_vers set to invalid value"
#endif /* H5E_auto_vers */
#else /* H5E_auto_t_vers */
#error "H5E_auto_t_vers set to invalid value"
#endif /* H5E_auto_t_vers */
#endif /* H5version_H */