[svn-r14211] Description:

	Remove --enable-hdfv1_6 configure flag, now that all dependencies on it
have been removed and new --with-default-api-version=[v16|v18] and
--disable-deprecated-symbols flags have taken its place.

	Update types in bin/trace so that bin/reconfigure runs cleanly.

	Run bin/reconfigure to regenerate configure script, along with
other associated files, etc.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.4.10 (amazon) in debug mode

16 files changed, 156 insertions, 154 deletions

diff --git a/bin/trace b/bin/trace
index cc495b4..d579857 100755
--- a/bin/trace
+++ b/bin/trace
@@ -59,11 +59,13 @@ $Source = "";
                "unsigned"                   => "Iu",
                "unsigned int"               => "Iu",
                "H5I_type_t"                 => "It",
+	       "H5G_link_t"                 => "Ll", #Same as H5L_type_t now
 	       "H5L_type_t"                 => "Ll",
                "MPI_Comm"                   => "Mc",
                "MPI_Info"                   => "Mi",
                "H5FD_mem_t"                 => "Mt",
                "off_t"                      => "o",
+               "H5O_type_t"                 => "Ot",
                "H5P_class_t"                => "p",
 	       "hobj_ref_t"		    => "r",
                "H5R_type_t"                 => "Rt",
@@ -84,13 +86,16 @@ $Source = "";
                "void"                       => "x",
                "FILE"                       => "x",
                "H5A_operator_t"             => "x",
+	       "H5A_operator1_t"            => "x",
 	       "H5A_operator2_t"            => "x",
 	       "H5A_info_t"                 => "x",
                "H5AC_cache_config_t"        => "x",
                "H5D_operator_t"             => "x",
                "H5E_auto_t"                 => "x",
+               "H5E_auto1_t"                => "x",
                "H5E_auto2_t"                => "x",
                "H5E_walk_t"                 => "x",
+               "H5E_walk1_t"                => "x",
                "H5E_walk2_t"                => "x",
 	       "H5F_info_t"                 => "x",
                "H5FD_t"                     => "x",
@@ -113,6 +118,7 @@ $Source = "";
                "H5P_prp_delete_func_t"      => "x",
                "H5P_prp_get_func_t"         => "x",
                "H5P_prp_set_func_t"         => "x",
+               "H5P_prp_compare_func_t"     => "x",
                "H5T_cdata_t"                => "x",
                "H5T_conv_t"                 => "x",
                "H5T_conv_except_func_t"     => "x",
diff --git a/configure b/configure
index a1682ff..abd667d 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 14096 2007-08-20 21:55:38Z slu .
+# From configure.in Id: configure.in 14097 2007-08-21 21:08:27Z koziol .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.8.0-beta3post1.
 #
@@ -1571,8 +1571,6 @@ Optional Features:
   --enable-linux-lfs      Enable support for large (64-bit) files on Linux.
                           [default=check]
   --enable-threadsafe     Enable thread safe capability
-  --enable-hdf5v1_6       Compile the HDF5 v1.6 compatibility interface
-                          [default=no]
   --enable-gpfs           Enable GPFS hints for the MPI/POSIX file driver.
                           [default=no]
   --enable-debug=all      Turn on debugging in all packages. One may also
@@ -7926,7 +7924,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7929 "configure"' > conftest.$ac_ext
+  echo '#line 7927 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10200,11 +10198,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10203: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10201: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10207: \$? = $ac_status" >&5
+   echo "$as_me:10205: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10468,11 +10466,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10471: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10469: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10475: \$? = $ac_status" >&5
+   echo "$as_me:10473: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10572,11 +10570,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10575: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10573: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10579: \$? = $ac_status" >&5
+   echo "$as_me:10577: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12952,7 +12950,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12955 "configure"
+#line 12953 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13052,7 +13050,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13055 "configure"
+#line 13053 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15404,11 +15402,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15407: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15405: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15411: \$? = $ac_status" >&5
+   echo "$as_me:15409: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15508,11 +15506,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15511: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15509: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15515: \$? = $ac_status" >&5
+   echo "$as_me:15513: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17078,11 +17076,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17081: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17079: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17085: \$? = $ac_status" >&5
+   echo "$as_me:17083: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17182,11 +17180,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17185: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17183: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17189: \$? = $ac_status" >&5
+   echo "$as_me:17187: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19380,11 +19378,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19383: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19381: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19387: \$? = $ac_status" >&5
+   echo "$as_me:19385: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19648,11 +19646,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19651: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19649: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19655: \$? = $ac_status" >&5
+   echo "$as_me:19653: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19752,11 +19750,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19755: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19753: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19759: \$? = $ac_status" >&5
+   echo "$as_me:19757: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -45585,27 +45583,6 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether HDF5 v1.6 compatibility functions enabled" >&5
-echo $ECHO_N "checking whether HDF5 v1.6 compatibility functions enabled... $ECHO_C" >&6; }
-# Check whether --enable-hdf5v1_6 was given.
-if test "${enable_hdf5v1_6+set}" = set; then
-  enableval=$enable_hdf5v1_6; HDF5_V1_6_COMPAT=$enableval
-fi
-
-
-if test "$HDF5_V1_6_COMPAT" = "yes"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define WANT_H5_V1_6_COMPAT 1
-_ACEOF
-
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
 
 { echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
 echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; }
@@ -54445,8 +54422,8 @@ IF_ENABLED_DISABLED "$CODESTACK"
 PRINT_N "                           GPFS"
 IF_YES_NO "$GPFS"
 
-PRINT_N "        HDF5 v1.6 Compatibility"
-IF_YES_NO "$HDF5_V1_6_COMPAT"
+PRINT_N "            Default API Mapping"
+PRINT "$DEFAULT_API_VERSION"
 
 PRINT_N "                        hsize_t"
 case "$HSIZET" in
diff --git a/configure.in b/configure.in
index 0de3499..682ac1c 100644
--- a/configure.in
+++ b/configure.in
@@ -1702,25 +1702,6 @@ if test "X$THREADSAFE" = "Xyes"; then
 fi
 
 dnl ----------------------------------------------------------------------
-dnl Check if they would like the HDF5 v1.6 compatibility functions
-dnl compiled in
-dnl
-AC_MSG_CHECKING([whether HDF5 v1.6 compatibility functions enabled])
-AC_ARG_ENABLE([hdf5v1_6],
-              [AC_HELP_STRING([--enable-hdf5v1_6],
-                              [Compile the HDF5 v1.6 compatibility
-                               interface [default=no]])],
-              [HDF5_V1_6_COMPAT=$enableval])
-
-if test "$HDF5_V1_6_COMPAT" = "yes"; then
-  AC_MSG_RESULT([yes])
-  AC_DEFINE([WANT_H5_V1_6_COMPAT], [1],
-            [Define if the HDF5 v1.6 compatibility functions are to be compiled in])
-else
-  AC_MSG_RESULT([no])
-fi
-
-dnl ----------------------------------------------------------------------
 dnl How does one figure out the local time zone?  Anyone know of a
 dnl Posix way to do this?
 dnl
@@ -4038,8 +4019,8 @@ IF_ENABLED_DISABLED "$CODESTACK"
 PRINT_N "                           GPFS"
 IF_YES_NO "$GPFS"
 
-PRINT_N "        HDF5 v1.6 Compatibility"
-IF_YES_NO "$HDF5_V1_6_COMPAT"
+PRINT_N "            Default API Mapping"
+PRINT "$DEFAULT_API_VERSION"
 
 PRINT_N "                        hsize_t"
 case "$HSIZET" in
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 3dbccf6..278d5bf 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -72,8 +72,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libhdf5_hl_la_LIBADD =
-am_libhdf5_hl_la_OBJECTS = H5LT.lo H5TB.lo H5IM.lo H5DS.lo H5PT.lo \
-	H5LTparse.lo H5LTanalyze.lo
+am_libhdf5_hl_la_OBJECTS = H5DS.lo H5IM.lo H5LT.lo H5LTanalyze.lo \
+	H5LTparse.lo H5PT.lo H5TB.lo
 libhdf5_hl_la_OBJECTS = $(am_libhdf5_hl_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
@@ -327,7 +327,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
 
 # This library is our main target.
 lib_LTLIBRARIES = libhdf5_hl.la
-libhdf5_hl_la_SOURCES = H5LT.c H5TB.c H5IM.c H5DS.c H5PT.c H5LTparse.c H5LTanalyze.c
+libhdf5_hl_la_SOURCES = H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c
 
 # Public header files (to be installed)
 include_HEADERS = hdf5_hl.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h
diff --git a/src/H5O.c b/src/H5O.c
index 5711140..2dd7d79 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -588,6 +588,7 @@ H5Oset_comment(hid_t loc_id, const char *name, const char *comment,
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Oset_comment, FAIL)
+    H5TRACE4("e", "i*s*si", loc_id, name, comment, lapl_id);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -633,6 +634,7 @@ H5Oget_comment(hid_t loc_id, const char *name, char *comment, size_t bufsize,
     ssize_t     ret_value;              /* Return value */
 
     FUNC_ENTER_API(H5Oget_comment, FAIL)
+    H5TRACE5("Zs", "i*s*szi", loc_id, name, comment, bufsize, lapl_id);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
diff --git a/src/H5P.c b/src/H5P.c
index 73bbced..c6a762c 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -441,8 +441,8 @@ H5Pregister2(hid_t cls_id, const char *name, size_t size, void *def_value,
     herr_t ret_value;     /* return value */
 
     FUNC_ENTER_API(H5Pregister2, FAIL);
-    H5TRACE11("e","iszxxxxxxxx",cls_id,name,size,def_value,prp_create,prp_set,
-             prp_get,prp_delete,prp_copy,prp_cmp,prp_close);
+    H5TRACE11("e", "i*sz*xxxxxxxx", cls_id, name, size, def_value, prp_create,
+             prp_set, prp_get, prp_delete, prp_copy, prp_cmp, prp_close);
 
     /* Check arguments. */
     if(NULL == (pclass = H5I_object_verify(cls_id, H5I_GENPROP_CLS)))
@@ -610,8 +610,8 @@ H5Pinsert2(hid_t plist_id, const char *name, size_t size, void *value,
     herr_t ret_value;           /* return value */
 
     FUNC_ENTER_API(H5Pinsert2, FAIL);
-    H5TRACE10("e","iszxxxxxxx",plist_id,name,size,value,prp_set,prp_get,
-             prp_delete,prp_copy,prp_cmp,prp_close);
+    H5TRACE10("e", "i*sz*xxxxxxx", plist_id, name, size, value, prp_set, prp_get,
+             prp_delete, prp_copy, prp_cmp, prp_close);
 
     /* Check arguments. */
     if(NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST)))
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index e335720..97323dc 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -1428,8 +1428,8 @@ H5Pget_filter2(hid_t plist_id, unsigned idx, unsigned int *flags/*out*/,
     H5Z_filter_t ret_value;     /* return value */
 
     FUNC_ENTER_API(H5Pget_filter2, H5Z_FILTER_ERROR)
-    H5TRACE8("Zf","iIux*zxzx*Iu",plist_id,idx,flags,cd_nelmts,cd_values,namelen,
-             name,filter_config);
+    H5TRACE8("Zf", "iIux*zxzxx", plist_id, idx, flags, cd_nelmts, cd_values,
+             namelen, name, filter_config);
 
     /* Check args */
     if(cd_nelmts || cd_values) {
@@ -1560,8 +1560,8 @@ H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id, unsigned int *flags/*out*/
     herr_t ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_API(H5Pget_filter_by_id2, FAIL)
-    H5TRACE8("e","iZfx*zxzx*Iu",plist_id,id,flags,cd_nelmts,cd_values,namelen,
-             name,filter_config);
+    H5TRACE8("e", "iZfx*zxzx*Iu", plist_id, id, flags, cd_nelmts, cd_values,
+             namelen, name, filter_config);
 
     /* Check args */
     if(cd_nelmts || cd_values) {
@@ -2645,7 +2645,7 @@ H5Pget_filter1(hid_t plist_id, unsigned idx, unsigned int *flags/*out*/,
     H5Z_filter_t ret_value;     /* return value */
 
     FUNC_ENTER_API(H5Pget_filter1, H5Z_FILTER_ERROR)
-    H5TRACE7("Zf","iIux*zxzx",plist_id,idx,flags,cd_nelmts,cd_values,namelen,
+    H5TRACE7("Zf", "iIux*zxzx", plist_id, idx, flags, cd_nelmts, cd_values, namelen,
              name);
 
     /* Check args */
@@ -2728,7 +2728,7 @@ H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id, unsigned int *flags/*out*/
     herr_t ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_API(H5Pget_filter_by_id1, FAIL)
-    H5TRACE7("e","iZfx*zxzx",plist_id,id,flags,cd_nelmts,cd_values,namelen,
+    H5TRACE7("e", "iZfx*zxzx", plist_id, id, flags, cd_nelmts, cd_values, namelen,
              name);
 
     /* Check args */
diff --git a/src/H5Pdeprec.c b/src/H5Pdeprec.c
index e6ff099..1234735 100644
--- a/src/H5Pdeprec.c
+++ b/src/H5Pdeprec.c
@@ -253,8 +253,8 @@ H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value,
     herr_t ret_value;     /* return value */
 
     FUNC_ENTER_API(H5Pregister1, FAIL);
-    H5TRACE10("e","iszxxxxxxx",cls_id,name,size,def_value,prp_create,prp_set,
-             prp_get,prp_delete,prp_copy,prp_close);
+    H5TRACE10("e", "i*sz*xxxxxxx", cls_id, name, size, def_value, prp_create,
+             prp_set, prp_get, prp_delete, prp_copy, prp_close);
 
     /* Check arguments. */
     if(NULL == (pclass = H5I_object_verify(cls_id, H5I_GENPROP_CLS)))
@@ -422,8 +422,8 @@ H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value,
     herr_t ret_value;           /* return value */
 
     FUNC_ENTER_API(H5Pinsert1, FAIL);
-    H5TRACE9("e","iszxxxxxx",plist_id,name,size,value,prp_set,prp_get,
-             prp_delete,prp_copy,prp_close);
+    H5TRACE9("e", "i*sz*xxxxxx", plist_id, name, size, value, prp_set, prp_get,
+             prp_delete, prp_copy, prp_close);
 
     /* Check arguments. */
     if(NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST)))
diff --git a/src/H5R.c b/src/H5R.c
index 2fe44fd..373bde5 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -777,6 +777,7 @@ H5Rget_obj_type2(hid_t id, H5R_type_t ref_type, const void *ref,
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(H5Rget_obj_type2, FAIL)
+    H5TRACE4("e", "iRt*x*Ot", id, ref_type, ref, obj_type);
 
     /* Check args */
     if(H5G_loc(id, &loc) < 0)
diff --git a/src/H5Z.c b/src/H5Z.c
index 2571a1d..de26831 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -1261,6 +1261,7 @@ H5Zget_filter_info(H5Z_filter_t filter, unsigned int *filter_config_flags)
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(H5Zget_filter_info, FAIL)
+    H5TRACE2("e", "Zf*Iu", filter, filter_config_flags);
 
     /* Look up the filter class info */
     if(NULL == (fclass = H5Z_find(filter)))
diff --git a/src/H5config.h.in b/src/H5config.h.in
index b9891e2..b382f14 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -628,9 +628,6 @@
 /* Check exception handling functions during data conversions */
 #undef WANT_DCONV_EXCEPTION
 
-/* Define if the HDF5 v1.6 compatibility functions are to be compiled in */
-#undef WANT_H5_V1_6_COMPAT
-
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
diff --git a/src/H5trace.c b/src/H5trace.c
index 2ad8222..0ad99b2 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -1254,6 +1254,40 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
 	    }
 	    break;
 
+	case 'O':
+	    switch(type[1]) {
+                case 't':
+                    if(ptr) {
+                        if(vp)
+                            fprintf(out, "0x%lx", (unsigned long)vp);
+                        else
+                            fprintf(out, "NULL");
+                    } /* end if */
+                    else {
+                        H5O_type_t objtype = va_arg(ap, H5O_type_t); /*lint !e64 Type mismatch not really occuring */
+                        switch(objtype) {
+                            case H5O_TYPE_GROUP:
+                                fprintf(out, "H5O_TYPE_GROUP");
+                                break;
+                            case H5O_TYPE_DATASET:
+                                fprintf(out, "H5O_TYPE_DATASET");
+                                break;
+                            case H5O_TYPE_NAMED_DATATYPE:
+                                fprintf(out, "H5O_TYPE_NAMED_DATATYPE");
+                                break;
+                            default:
+                                fprintf(out, "BADTYPE(%ld)", (long)objtype);
+                                break;
+                        } /* end switch */
+                    } /* end else */
+                    break;
+
+                default:
+                    fprintf(out, "BADTYPE(S%c)", type[1]);
+                    goto error;
+	    } /* end switch */
+	    break;
+
 	case 'p':
 	    if (ptr) {
 		if (vp) {
diff --git a/src/Makefile.in b/src/Makefile.in
index 5789b5a..8bea6bb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -83,41 +83,43 @@ am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \
 	H5Adeprec.lo H5Aint.lo H5Atest.lo H5AC.lo H5B.lo H5Bcache.lo \
 	H5B2.lo H5B2cache.lo H5B2dbg.lo H5B2int.lo H5B2stat.lo \
 	H5B2test.lo H5C.lo H5CS.lo H5D.lo H5Dcompact.lo H5Dcontig.lo \
-	H5Ddbg.lo H5Ddeprec.lo H5Defl.lo H5Dfill.lo H5Dint.lo H5Dio.lo H5Distore.lo \
-	H5Dmpio.lo H5Doh.lo H5Dselect.lo H5Dtest.lo H5E.lo \
-	H5Edeprec.lo H5Eint.lo H5F.lo H5Fdbg.lo H5Ffake.lo H5Fmount.lo \
-	H5Fsfile.lo H5Fsuper.lo H5Ftest.lo H5FD.lo H5FDcore.lo \
-	H5FDdirect.lo H5FDfamily.lo H5FDlog.lo H5FDmpi.lo H5FDmpio.lo \
-	H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo H5FDstdio.lo \
-	H5FDstream.lo H5FL.lo H5FO.lo H5FS.lo H5FScache.lo H5FSdbg.lo \
-	H5FSsection.lo H5G.lo H5Gbtree2.lo H5Gcompact.lo H5Gdense.lo \
-	H5Gdeprec.lo H5Gent.lo H5Gint.lo H5Glink.lo H5Gloc.lo \
-	H5Gname.lo H5Gnode.lo H5Gobj.lo H5Goh.lo H5Gstab.lo H5Gtest.lo \
-	H5Gtraverse.lo H5HF.lo H5HFbtree2.lo H5HFcache.lo H5HFdbg.lo \
-	H5HFdblock.lo H5HFdtable.lo H5HFhdr.lo H5HFhuge.lo \
-	H5HFiblock.lo H5HFiter.lo H5HFman.lo H5HFsection.lo \
-	H5HFspace.lo H5HFstat.lo H5HFtest.lo H5HFtiny.lo H5HG.lo \
-	H5HGdbg.lo H5HL.lo H5HLdbg.lo H5HP.lo H5I.lo H5L.lo \
-	H5Lexternal.lo H5MF.lo H5MM.lo H5MP.lo H5MPtest.lo H5O.lo \
-	H5Oainfo.lo H5Oalloc.lo H5Oattr.lo H5Oattribute.lo H5Obogus.lo \
-	H5Obtreek.lo H5Ocache.lo H5Ocont.lo H5Ocopy.lo H5Odbg.lo \
-	H5Odrvinfo.lo H5Odtype.lo H5Oefl.lo H5Ofill.lo H5Oginfo.lo \
-	H5Olayout.lo H5Olinfo.lo H5Olink.lo H5Omessage.lo H5Omtime.lo \
-	H5Oname.lo H5Onull.lo H5Opline.lo H5Orefcount.lo H5Osdspace.lo \
-	H5Oshared.lo H5Ostab.lo H5Oshmesg.lo H5Otest.lo H5Ounknown.lo \
-	H5P.lo H5Pacpl.lo H5Pdcpl.lo H5Pdeprec.lo H5Pdxpl.lo H5Pfapl.lo H5Pfcpl.lo \
-	H5Pfmpl.lo H5Pgcpl.lo H5Pint.lo H5Plapl.lo H5Plcpl.lo H5Pocpl.lo \
-	H5Pocpypl.lo H5Pstrcpl.lo H5Ptest.lo H5R.lo H5Rdeprec.lo H5RC.lo H5RS.lo \
-	H5S.lo H5Sall.lo H5Sdbg.lo H5Shyper.lo H5Smpio.lo H5Snone.lo \
-	H5Spoint.lo H5Sselect.lo H5Stest.lo H5SL.lo H5SM.lo \
-	H5SMbtree2.lo H5SMcache.lo H5SMtest.lo H5ST.lo H5T.lo \
-	H5Tarray.lo H5Tbit.lo H5Tcommit.lo H5Tcompound.lo H5Tconv.lo \
-	H5Tcset.lo H5Tdbg.lo H5Tdeprec.lo H5Tenum.lo H5Tfields.lo \
-	H5Tfixed.lo H5Tfloat.lo H5Tinit.lo H5Tnative.lo H5Toffset.lo \
-	H5Toh.lo H5Topaque.lo H5Torder.lo H5Tpad.lo H5Tprecis.lo \
-	H5Tstrpad.lo H5Tvisit.lo H5Tvlen.lo H5TS.lo H5V.lo H5WB.lo \
-	H5Z.lo H5Zdeflate.lo H5Zfletcher32.lo H5Znbit.lo H5Zshuffle.lo \
-	H5Zszip.lo H5Zscaleoffset.lo H5Ztrans.lo
+	H5Ddbg.lo H5Ddeprec.lo H5Defl.lo H5Dfill.lo H5Dint.lo H5Dio.lo \
+	H5Distore.lo H5Dmpio.lo H5Doh.lo H5Dselect.lo H5Dtest.lo \
+	H5E.lo H5Edeprec.lo H5Eint.lo H5F.lo H5Fdbg.lo H5Ffake.lo \
+	H5Fmount.lo H5Fsfile.lo H5Fsuper.lo H5Ftest.lo H5FD.lo \
+	H5FDcore.lo H5FDdirect.lo H5FDfamily.lo H5FDlog.lo H5FDmpi.lo \
+	H5FDmpio.lo H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo \
+	H5FDstdio.lo H5FDstream.lo H5FL.lo H5FO.lo H5FS.lo \
+	H5FScache.lo H5FSdbg.lo H5FSsection.lo H5G.lo H5Gbtree2.lo \
+	H5Gcompact.lo H5Gdense.lo H5Gdeprec.lo H5Gent.lo H5Gint.lo \
+	H5Glink.lo H5Gloc.lo H5Gname.lo H5Gnode.lo H5Gobj.lo H5Goh.lo \
+	H5Gstab.lo H5Gtest.lo H5Gtraverse.lo H5HF.lo H5HFbtree2.lo \
+	H5HFcache.lo H5HFdbg.lo H5HFdblock.lo H5HFdtable.lo H5HFhdr.lo \
+	H5HFhuge.lo H5HFiblock.lo H5HFiter.lo H5HFman.lo \
+	H5HFsection.lo H5HFspace.lo H5HFstat.lo H5HFtest.lo \
+	H5HFtiny.lo H5HG.lo H5HGdbg.lo H5HL.lo H5HLdbg.lo H5HP.lo \
+	H5I.lo H5L.lo H5Lexternal.lo H5MF.lo H5MM.lo H5MP.lo \
+	H5MPtest.lo H5O.lo H5Oainfo.lo H5Oalloc.lo H5Oattr.lo \
+	H5Oattribute.lo H5Obogus.lo H5Obtreek.lo H5Ocache.lo \
+	H5Ocont.lo H5Ocopy.lo H5Odbg.lo H5Odrvinfo.lo H5Odtype.lo \
+	H5Oefl.lo H5Ofill.lo H5Oginfo.lo H5Olayout.lo H5Olinfo.lo \
+	H5Olink.lo H5Omessage.lo H5Omtime.lo H5Oname.lo H5Onull.lo \
+	H5Opline.lo H5Orefcount.lo H5Osdspace.lo H5Oshared.lo \
+	H5Ostab.lo H5Oshmesg.lo H5Otest.lo H5Ounknown.lo H5P.lo \
+	H5Pacpl.lo H5Pdcpl.lo H5Pdeprec.lo H5Pdxpl.lo H5Pfapl.lo \
+	H5Pfcpl.lo H5Pfmpl.lo H5Pgcpl.lo H5Pint.lo H5Plapl.lo \
+	H5Plcpl.lo H5Pocpl.lo H5Pocpypl.lo H5Pstrcpl.lo H5Ptest.lo \
+	H5R.lo H5Rdeprec.lo H5RC.lo H5RS.lo H5S.lo H5Sall.lo H5Sdbg.lo \
+	H5Shyper.lo H5Smpio.lo H5Snone.lo H5Spoint.lo H5Sselect.lo \
+	H5Stest.lo H5SL.lo H5SM.lo H5SMbtree2.lo H5SMcache.lo \
+	H5SMtest.lo H5ST.lo H5T.lo H5Tarray.lo H5Tbit.lo H5Tcommit.lo \
+	H5Tcompound.lo H5Tconv.lo H5Tcset.lo H5Tdbg.lo H5Tdeprec.lo \
+	H5Tenum.lo H5Tfields.lo H5Tfixed.lo H5Tfloat.lo H5Tinit.lo \
+	H5Tnative.lo H5Toffset.lo H5Toh.lo H5Topaque.lo H5Torder.lo \
+	H5Tpad.lo H5Tprecis.lo H5Tstrpad.lo H5Tvisit.lo H5Tvlen.lo \
+	H5TS.lo H5V.lo H5WB.lo H5Z.lo H5Zdeflate.lo H5Zfletcher32.lo \
+	H5Znbit.lo H5Zshuffle.lo H5Zszip.lo H5Zscaleoffset.lo \
+	H5Ztrans.lo
 libhdf5_la_OBJECTS = $(am_libhdf5_la_OBJECTS)
 libhdf5_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -402,7 +404,9 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
         H5AC.c H5B.c H5Bcache.c \
         H5B2.c H5B2cache.c H5B2dbg.c H5B2int.c H5B2stat.c H5B2test.c \
         H5C.c H5CS.c \
-        H5D.c H5Dcompact.c H5Dcontig.c H5Ddbg.c H5Ddeprec.c H5Defl.c H5Dfill.c H5Dint.c H5Dio.c \
+        H5D.c H5Dcompact.c H5Dcontig.c H5Ddbg.c \
+        H5Ddeprec.c H5Defl.c H5Dfill.c H5Dint.c \
+        H5Dio.c \
         H5Distore.c H5Dmpio.c H5Doh.c H5Dselect.c H5Dtest.c \
         H5E.c H5Edeprec.c H5Eint.c \
         H5F.c H5Fdbg.c H5Ffake.c H5Fmount.c H5Fsfile.c H5Fsuper.c H5Ftest.c \
@@ -428,10 +432,12 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
         H5Oname.c H5Onull.c H5Opline.c H5Orefcount.c \
         H5Osdspace.c H5Oshared.c H5Ostab.c \
         H5Oshmesg.c H5Otest.c H5Ounknown.c \
-        H5P.c H5Pacpl.c H5Pdcpl.c H5Pdeprec.c H5Pdxpl.c H5Pfapl.c H5Pfcpl.c H5Pfmpl.c \
+        H5P.c H5Pacpl.c H5Pdcpl.c \
+        H5Pdeprec.c H5Pdxpl.c H5Pfapl.c H5Pfcpl.c H5Pfmpl.c \
         H5Pgcpl.c H5Pint.c \
         H5Plapl.c H5Plcpl.c H5Pocpl.c H5Pocpypl.c H5Pstrcpl.c H5Ptest.c \
-        H5R.c H5Rdeprec.c H5RC.c \
+        H5R.c H5Rdeprec.c \
+        H5RC.c \
         H5RS.c \
         H5S.c H5Sall.c H5Sdbg.c H5Shyper.c H5Smpio.c H5Snone.c H5Spoint.c \
         H5Sselect.c H5Stest.c H5SL.c H5SM.c H5SMbtree2.c \
@@ -729,9 +735,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Pstrcpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Ptest.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5R.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Rdeprec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5RC.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5RS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Rdeprec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5S.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SL.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5SM.Plo@am__quote@
diff --git a/test/Makefile.in b/test/Makefile.in
index d09072f..1f7f506 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -81,13 +81,13 @@ am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
 	getname$(EXEEXT) vfd$(EXEEXT) ntypes$(EXEEXT) dangle$(EXEEXT) \
 	dtransform$(EXEEXT) reserved$(EXEEXT) cross_read$(EXEEXT) \
 	btree2$(EXEEXT) fheap$(EXEEXT)
-am__EXEEXT_2 = gen_bogus$(EXEEXT) gen_deflate$(EXEEXT) \
-	gen_filters$(EXEEXT) gen_new_array$(EXEEXT) \
-	gen_new_fill$(EXEEXT) gen_new_group$(EXEEXT) \
-	gen_new_mtime$(EXEEXT) gen_new_super$(EXEEXT) \
-	gen_noencoder$(EXEEXT) gen_nullspace$(EXEEXT) \
-	space_overflow$(EXEEXT) gen_cross$(EXEEXT) \
-	gen_udlinks$(EXEEXT)
+am__EXEEXT_2 = gen_bogus$(EXEEXT) gen_cross$(EXEEXT) \
+	gen_deflate$(EXEEXT) gen_filters$(EXEEXT) \
+	gen_new_array$(EXEEXT) gen_new_fill$(EXEEXT) \
+	gen_new_group$(EXEEXT) gen_new_mtime$(EXEEXT) \
+	gen_new_super$(EXEEXT) gen_noencoder$(EXEEXT) \
+	gen_nullspace$(EXEEXT) gen_udlinks$(EXEEXT) \
+	space_overflow$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 big_SOURCES = big.c
 big_OBJECTS = big.$(OBJEXT)
@@ -294,10 +294,10 @@ am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tarray.$(OBJEXT) \
 	tfile.$(OBJEXT) tgenprop.$(OBJEXT) th5o.$(OBJEXT) \
 	th5s.$(OBJEXT) theap.$(OBJEXT) tid.$(OBJEXT) \
 	titerate.$(OBJEXT) tmeta.$(OBJEXT) tmisc.$(OBJEXT) \
-	ttime.$(OBJEXT) trefer.$(OBJEXT) trefstr.$(OBJEXT) \
-	tselect.$(OBJEXT) tsohm.$(OBJEXT) tskiplist.$(OBJEXT) \
-	ttst.$(OBJEXT) tunicode.$(OBJEXT) tvltypes.$(OBJEXT) \
-	tvlstr.$(OBJEXT)
+	trefer.$(OBJEXT) trefstr.$(OBJEXT) tselect.$(OBJEXT) \
+	tskiplist.$(OBJEXT) tsohm.$(OBJEXT) ttime.$(OBJEXT) \
+	ttst.$(OBJEXT) tunicode.$(OBJEXT) tvlstr.$(OBJEXT) \
+	tvltypes.$(OBJEXT)
 testhdf5_OBJECTS = $(am_testhdf5_OBJECTS)
 testhdf5_LDADD = $(LDADD)
 testhdf5_DEPENDENCIES = libh5test.la $(LIBHDF5)
@@ -637,9 +637,9 @@ TEST_PROG = testhdf5 lheap ohdr stab gheap cache cache_api \
 # --enable-build-all at configure time.
 # The gen_old_* files can only be compiled with older versions of the library
 # so do not appear in this list.
-BUILD_ALL_PROGS = gen_bogus gen_deflate gen_filters gen_new_array gen_new_fill \
-                gen_new_group gen_new_mtime gen_new_super gen_noencoder \
-                gen_nullspace space_overflow gen_cross gen_udlinks
+BUILD_ALL_PROGS = gen_bogus gen_cross gen_deflate gen_filters gen_new_array \
+    gen_new_fill gen_new_group gen_new_mtime gen_new_super gen_noencoder \
+    gen_nullspace gen_udlinks space_overflow
 
 
 # The libh5test library provides common support code for the tests.
@@ -658,9 +658,9 @@ ttsafe_SOURCES = ttsafe.c ttsafe_dcreate.c ttsafe_error.c ttsafe_cancel.c
 
 # Sources for testhdf5 executable
 testhdf5_SOURCES = testhdf5.c tarray.c tattr.c tchecksum.c tconfig.c tfile.c \
-    tgenprop.c th5o.c th5s.c theap.c tid.c titerate.c tmeta.c tmisc.c ttime.c \
-    trefer.c trefstr.c tselect.c tsohm.c tskiplist.c ttst.c tunicode.c tvltypes.c \
-    tvlstr.c
+    tgenprop.c th5o.c th5s.c theap.c tid.c titerate.c tmeta.c tmisc.c \
+    trefer.c trefstr.c tselect.c tskiplist.c tsohm.c ttime.c ttst.c tunicode.c \
+    tvlstr.c tvltypes.c
 
 
 # Temporary files.
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 186228f..1823f8b 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -69,9 +69,9 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 am__EXEEXT_1 = h5repacktst$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am__objects_1 = h5repack.$(OBJEXT) h5repack_copy.$(OBJEXT) \
-	h5repack_refs.$(OBJEXT) h5repack_filters.$(OBJEXT) \
-	h5repack_list.$(OBJEXT) h5repack_opttable.$(OBJEXT) \
-	h5repack_parse.$(OBJEXT) h5repack_verify.$(OBJEXT)
+	h5repack_filters.$(OBJEXT) h5repack_list.$(OBJEXT) \
+	h5repack_opttable.$(OBJEXT) h5repack_parse.$(OBJEXT) \
+	h5repack_refs.$(OBJEXT) h5repack_verify.$(OBJEXT)
 am_h5repack_OBJECTS = $(am__objects_1) h5repack_main.$(OBJEXT)
 h5repack_OBJECTS = $(am_h5repack_OBJECTS)
 h5repack_LDADD = $(LDADD)
@@ -350,8 +350,8 @@ SCRIPT_DEPEND = h5repack$(EXEEXT)
 LDADD = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
 
 # Source files
-COMMON_SOURCES = h5repack.c h5repack_copy.c h5repack_refs.c h5repack_filters.c \
-        h5repack_list.c h5repack_opttable.c h5repack_parse.c \
+COMMON_SOURCES = h5repack.c h5repack_copy.c h5repack_filters.c \
+        h5repack_list.c h5repack_opttable.c h5repack_parse.c h5repack_refs.c \
         h5repack_verify.c
 
 h5repack_SOURCES = $(COMMON_SOURCES) h5repack_main.c
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index 8bef64d..62bb0a9 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -557,9 +557,6 @@
    don't fit into size allowed */
 #define H5_VSNPRINTF_WORKS 1
 
-/* Define if the HDF5 v1.6 compatibility functions are to be compiled in */
-/* #undef H5_WANT_H5_V1_6_COMPAT */
-
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 /* #undef H5_WORDS_BIGENDIAN */