[svn-r15221] Description:

	Bring changes from trunk from the time the branch was created (r14280)
up to the 1.8.0 release (r14525) back into the metadata journaling branch.

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
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

5 files changed, 10 insertions, 11 deletions

diff --git a/examples/Makefile.in b/examples/Makefile.in
index f456fff..6dc5b22 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -186,6 +186,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/examples/h5_extlink.c b/examples/h5_extlink.c
index 1e25ef6..a728bb2 100644
--- a/examples/h5_extlink.c
+++ b/examples/h5_extlink.c
@@ -216,7 +216,7 @@ static void soft_link_example(void)
 {
     hid_t file_id;
     hid_t group_id;
-    /* Define the link class that we'll use to register "user-defined hard
+    /* Define the link class that we'll use to register "user-defined soft
      * links" using the callbacks we defined above.
      * A link class can have NULL for any callback except its traverse
      * callback.
diff --git a/examples/h5_ref2reg.c b/examples/h5_ref2reg.c
index 0cea797..9c75d91 100644
--- a/examples/h5_ref2reg.c
+++ b/examples/h5_ref2reg.c
@@ -97,8 +97,7 @@ int main(void)
      * Create a reference to elements selection.
      */
     status = H5Sselect_none(space_id);
-    status = H5Sselect_elements(space_id, H5S_SELECT_SET, num_points,
-                                (const hsize_t **)coord);
+    status = H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, coord);
     status = H5Rcreate(&ref[1], file_id, dsetnamev, H5R_DATASET_REGION, space_id);
 
     /*
diff --git a/examples/h5_select.c b/examples/h5_select.c
index dc08b8a..595a1b3 100644
--- a/examples/h5_select.c
+++ b/examples/h5_select.c
@@ -171,8 +171,7 @@ main (void)
     coord[2][0] = 3; coord[2][1] = 5;
     coord[3][0] = 5; coord[3][1] = 6;
 
-    ret = H5Sselect_elements(fid, H5S_SELECT_SET, NPOINTS,
-                             (const hsize_t **)coord);
+    ret = H5Sselect_elements(fid, H5S_SELECT_SET, NPOINTS, coord);
 
     /*
      * Write new selection of points to the dataset.
diff --git a/examples/h5_shared_mesg.c b/examples/h5_shared_mesg.c
index 2548350..68340e0 100644
--- a/examples/h5_shared_mesg.c
+++ b/examples/h5_shared_mesg.c
@@ -112,7 +112,7 @@ int main(void)
      * it holds.  For the simple case, we'll put every message that could be
      * shared in this single index.
      */
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 40);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 40);
     if(ret < 0) goto error;
 
     /* The other property that can be set for shared messages is the
@@ -148,7 +148,7 @@ int main(void)
      * will be about the same size as a normal file (with just a little extra
      * overhead).
      */
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 1000);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 1000);
     if(ret < 0) goto error;
 
     ret = create_standard_file("only_huge_mesgs_file.h5", fcpl_id);
@@ -159,7 +159,7 @@ int main(void)
      * attributes (which might make sense if we were going to use committed
      * datatypes).  We could change the flags on the index:
      */
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_SDSPACE_FLAG | H5O_MESG_ATTR_FLAG, 40);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_ATTR_FLAG, 40);
     if(ret < 0) goto error;
 
     ret = create_standard_file("only_dspaces_and_attrs_file.h5", fcpl_id);
@@ -172,9 +172,9 @@ int main(void)
      */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 2);
     if(ret < 0) goto error;
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_DTYPE_FLAG | H5O_MESG_SDSPACE_FLAG, 40);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_SDSPACE_FLAG, 40);
     if(ret < 0) goto error;
-    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_ATTR_FLAG, 40);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_ATTR_FLAG, 40);
     if(ret < 0) goto error;
     
     ret = create_standard_file("separate_indexes_file.h5", fcpl_id);
@@ -187,7 +187,7 @@ int main(void)
      */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
     if(ret < 0) goto error;
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 40);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 40);
     if(ret < 0) goto error;
 
     ret = H5Pset_shared_mesg_phase_change(fcpl_id, 5, 0);