[svn-r1697] Changes since 19990915

----------------------

./src/H5public.h
	We undefine a bunch of things that could get redefined in the config
	file because some customers have applications that include headers
	from multiple packages, all of which might be using autoconf.

	Include <stdint.h> for the C9x types.

./test/h5test.h
	More flushing of stdout for when testing is redirected down a pipe.

./tools/h5ls.c
	Added a `-S' or `--simple' switch which causes the output to be
	simplified somewhat for easier parsing by other scripts. For instance,
	characters are escaped using a very simple mechanism instead of C's
	more complicated backslash notation, data doesn't have `{}' or `[]'
	characters interspersed for compound and array types, and data is
	printed with exactly one element per line.  This switch is now used by
	an HDF5-to-HTML CGI script being developed for the DMF people.

./tools/h5tools.c
./tools/h5tools.h
	The repeat threshold which controls how strings are printed when a
	character repeats a bunch of times is now settable at runtime instead
	of compile time. The default is to show all characters, like

	   "abceeeeeeeeeeeeeeeeeeeeeeeeeeeeeefgh"

	But if you set it to something like 5 then any sequence of 5 or more
	characters is replaced by something shorter, like:

	   "abc" 'e'x30 "fgh"	  or

	Added an `str_locale' property which describes how to escape special
	characters in strings. The default is C-like escapes but an
	alternative is ESCAPE_HTML which replaces all non-alphanumeric
	characters with a 3-character HTML escape of the form `%XX'

	Fixed a bug where empty strings didn't even have the quote characters
	printed. Now empty strings show up as `""' instead of absolutely
	nothing.

	Added a `per_line' property which controls the maximum number of
	elements which will appear per line of output. The default is infinity
	but in practice the right margin causes line breaks. By setting the
	`per_line' value to one and the right margin to a very large value one
	can achieve output with exactly one element per line.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h
index fb61498..dab4d5e 100644
--- a/src/H5FDmpio.h
+++ b/src/H5FDmpio.h
@@ -46,8 +46,13 @@ __DLL__ htri_t H5FD_mpio_tas_allsame(H5FD_t *_file, hbool_t newval);
 __DLL__ MPI_Comm H5FD_mpio_communicator(H5FD_t *_file);
 __DLL__ herr_t H5FD_mpio_setup(H5FD_t *_file, MPI_Datatype btype, MPI_Datatype ftype,
 		       haddr_t disp, hbool_t use_types);
+<<<<<<<<<<<<<< variant A
+__DLL__herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file);
+__DLL__herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file);
+>>>>>>>>>>>>>> variant B
 __DLL__ herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file);
 __DLL__ herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file);
+======= end of combination
 
 #endif /*HAVE_PARALLEL*/