[svn-r22987] ported revisions from 22742 to 22986 from the trunk

2 files changed, 1 insertions, 8 deletions

diff --git a/bin/h5vers b/bin/h5vers
index 138a8e9..475ff5a 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -187,10 +187,6 @@ die "unable to read file: $RELEASE\n" unless -r $file;
 my $CONFIGURE = $file;
 $CONFIGURE =~ s/[^\/]*$/..\/configure.ac/;
 die "unable to read file: $CONFIGURE\n" unless -r $file;
-# windows/src/H5pubconf.h
-my $H5PUBCONF = $file;
-$H5PUBCONF =~ s/[^\/]*$/..\/windows\/src\/H5pubconf.h/;
-die "unable to read file: $H5PUBCONF\n" unless -r $file;
 # vms/src/h5pubconf.h
 my $H5VMSPUBCONF = $file;
 $H5VMSPUBCONF =~ s/[^\/]*$/..\/vms\/src\/h5pubconf.h/;
@@ -242,7 +238,6 @@ if ($set) {
   $README = "";
   $RELEASE = "";
   $CONFIGURE = "";
-  $H5PUBCONF = "";
   $H5VMSPUBCONF = "";
   $LT_VERS = "";
   @newver = @curver;
@@ -392,9 +387,6 @@ sub gen_h5pubconf {
     close FILE;
 }
 
-# Update the Windows-maintained H5pubconf.h file
-gen_h5pubconf("HDF5", $H5PUBCONF, @newver) if $H5PUBCONF;
-    
 # Update the VMS-maintained h5pubconf.h file
 gen_h5pubconf("HDF5", $H5VMSPUBCONF, @newver) if $H5VMSPUBCONF;
     
diff --git a/bin/trace b/bin/trace
index e9d1203..67aeb17 100755
--- a/bin/trace
+++ b/bin/trace
@@ -64,6 +64,7 @@ $Source = "";
                "int32_t"                    => "Is",
                "unsigned"                   => "Iu",
                "unsigned int"               => "Iu",
+               "uint32_t"                   => "Iu",
                "H5I_type_t"                 => "It",
 	       "H5G_link_t"                 => "Ll", #Same as H5L_type_t now
 	       "H5L_type_t"                 => "Ll",