Merge branch 'develop' into dset_ohdr_minimize

3 files changed, 16 insertions, 16 deletions

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8c6540f..554ee44 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -32,25 +32,25 @@ INSTALL_TOP_FILES = README
 # it would try to compile them instead of using the h5cc script.
 # Use the boilerplate in config/examples.am instead.
 EXAMPLE_PROG = h5_write h5_read h5_extend_write h5_chunk_read h5_compound \
-           h5_crtgrpd h5_subset h5_cmprss h5_rdwt h5_crtgrpar h5_extend \
-           h5_crtatt h5_crtgrp h5_crtdat \
-           h5_group h5_select h5_attribute h5_mount h5_reference h5_drivers \
-           h5_ref2reg h5_extlink h5_elink_unix2win h5_shared_mesg h5_vds h5_vds-exc \
-           h5_vds-exclim h5_vds-eiger h5_vds-simpleIO h5_vds-percival \
-           h5_vds-percival-unlim h5_vds-percival-unlim-maxmin
+            h5_crtgrpd h5_subset h5_cmprss h5_rdwt h5_crtgrpar h5_extend \
+            h5_crtatt h5_crtgrp h5_crtdat \
+            h5_group h5_select h5_attribute h5_mount h5_reference h5_drivers \
+            h5_ref2reg h5_extlink h5_elink_unix2win h5_shared_mesg h5_vds h5_vds-exc \
+            h5_vds-exclim h5_vds-eiger h5_vds-simpleIO h5_vds-percival \
+            h5_vds-percival-unlim h5_vds-percival-unlim-maxmin
 TEST_SCRIPT=testh5cc.sh 
 TEST_EXAMPLES_SCRIPT=$(INSTALL_SCRIPT_FILES)
 
 # Install files
 # List all file that should be installed in examples directory
 INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
-          h5_crtgrpd.c h5_subset.c h5_cmprss.c h5_rdwt.c h5_crtgrpar.c \
-          h5_extend.c h5_crtatt.c h5_crtgrp.c h5_crtdat.c \
-          h5_compound.c h5_group.c h5_select.c h5_attribute.c h5_mount.c \
-          h5_reference.c h5_drivers.c h5_extlink.c h5_elink_unix2win.c   \
-          h5_ref2reg.c h5_shared_mesg.c ph5example.c h5_vds.c h5_vds-exc.c \
-          h5_vds-exclim.c h5_vds-eiger.c h5_vds-simpleIO.c h5_vds-percival.c \
-          h5_vds-percival-unlim.c h5_vds-percival-unlim-maxmin.c
+            h5_crtgrpd.c h5_subset.c h5_cmprss.c h5_rdwt.c h5_crtgrpar.c \
+            h5_extend.c h5_crtatt.c h5_crtgrp.c h5_crtdat.c \
+            h5_compound.c h5_group.c h5_select.c h5_attribute.c h5_mount.c \
+            h5_reference.c h5_drivers.c h5_extlink.c h5_elink_unix2win.c   \
+            h5_ref2reg.c h5_shared_mesg.c ph5example.c h5_vds.c h5_vds-exc.c \
+            h5_vds-exclim.c h5_vds-eiger.c h5_vds-simpleIO.c h5_vds-percival.c \
+            h5_vds-percival-unlim.c h5_vds-percival-unlim-maxmin.c
 
 
 
diff --git a/examples/h5_extlink.c b/examples/h5_extlink.c
index 1a07656..229e465 100644
--- a/examples/h5_extlink.c
+++ b/examples/h5_extlink.c
@@ -208,7 +208,7 @@ static void extlink_prefix_example(void)
  * that a path was supplied in the udata.
  */
 static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group,
-    const void *udata, size_t udata_size, hid_t lapl_id);
+    const void *udata, size_t udata_size, hid_t lapl_id, hid_t dxpl_id);
 
 static void soft_link_example(void)
 {
@@ -277,7 +277,7 @@ static void soft_link_example(void)
  */
 
 static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group,
-    const void *udata, size_t udata_size, hid_t lapl_id)
+    const void *udata, size_t udata_size, hid_t lapl_id, hid_t dxpl_id)
 {
     const char *target = (const char *) udata;
     hid_t ret_value;
diff --git a/examples/run-c-ex.sh.in b/examples/run-c-ex.sh.in
index 4d5d594..209cdd7 100644
--- a/examples/run-c-ex.sh.in
+++ b/examples/run-c-ex.sh.in
@@ -31,7 +31,7 @@ EXIT_FAILURE=1
  
 # Where the tool is installed.
 # default is relative path to installed location of the tools 
-prefix="${prefix:-@prefix@}"
+prefix="${prefix:-../../..}"
 PARALLEL=@PARALLEL@             # Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"