1 files changed, 3 insertions, 1 deletions
diff --git a/bin/trace b/bin/trace
index 1ed1678..f665d9d 100755
--- a/bin/trace
+++ b/bin/trace
@@ -68,6 +68,7 @@ $Source = "";
                "unsigned"                   => "Iu",
                "unsigned int"               => "Iu",
                "uint32_t"                   => "Iu",
+               "uint64_t"                   => "UL",
                "H5I_type_t"                 => "It",
                "H5G_link_t"                 => "Ll", #Same as H5L_type_t now
                "H5L_type_t"                 => "Ll",
@@ -111,6 +112,7 @@ $Source = "";
                "H5VL_link_specific_t"       => "Vm",
                "H5VL_object_get_t"          => "Vn",
                "H5VL_object_specific_t"     => "Vo",
+               "H5VL_request_specific_t"    => "Vr",
                "void"                       => "x",
                "FILE"                       => "x",
                "H5A_operator_t"             => "x",
@@ -315,7 +317,7 @@ sub rewrite_func ($$$$$) {
     # Ignored due to NO TRACE comment.
   } elsif ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) {
     # Replaced an H5TRACE macro.
-  } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*\s*(\(.*?\))?;??)\n/"$1$2$trace"/es) {
+  } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*[ \t]*(\(.*?\))?;??)\n/"$1$2$trace"/es) {
     # Added an H5TRACE macro after a FUNC_ENTER macro.
   } else {
     errmesg $file, $name, "unable to insert tracing information";