diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-04-21 22:46:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-04-21 22:46:38 (GMT) |
| commit | 5bb857476f99118cda0e54ea522f52933a582747 (patch) | |
| tree | 741024b69250fe9166091aa8f28bc78c35d3fb64 /perform | |
| parent | 35bbc743d4cf77d6aa8af2acf5578db02e5129ca (diff) | |
| download | hdf5-5bb857476f99118cda0e54ea522f52933a582747.zip hdf5-5bb857476f99118cda0e54ea522f52933a582747.tar.gz hdf5-5bb857476f99118cda0e54ea522f52933a582747.tar.bz2 | |
[svn-r16825] Description:
Bring revisions 16636:16821 from trunk to revise_chunks branch
Tested on:
FreeBSD/32 6.3 (duty)
Mac OS X/32 10.5.6 (amazon)
(h5committest not needed on this branch)
Diffstat (limited to 'perform')
| -rw-r--r-- | perform/Makefile.in | 8 | ||||
| -rw-r--r-- | perform/chunk.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/perform/Makefile.in b/perform/Makefile.in index 90b1be4..0d4815d 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -433,8 +433,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -577,7 +577,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/perform/chunk.c b/perform/chunk.c index 2777da0..a3c11c1 100644 --- a/perform/chunk.c +++ b/perform/chunk.c @@ -83,7 +83,7 @@ counter (unsigned UNUSED flags, size_t cd_nelmts, size_t *buf_size, void **buf); /* This message derives from H5Z */ -const H5Z_class_t H5Z_COUNTER[1] = {{ +const H5Z_class2_t H5Z_COUNTER[1] = {{ H5Z_CLASS_T_VERS, /* H5Z_class_t version */ FILTER_COUNTER, /* Filter id number */ 1, 1, /* Encoding and decoding enabled */ |