diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-01-13 13:15:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-01-13 13:15:49 (GMT) |
| commit | 8e391ad35a1ede1ac046f05710297aa40986642b (patch) | |
| tree | 247faeeacb9925beb90b6b8c10f0d875f93ed155 /perform | |
| parent | c3a1173026916e25a5a44f1d4255b889ccbaeb2b (diff) | |
| download | hdf5-8e391ad35a1ede1ac046f05710297aa40986642b.zip hdf5-8e391ad35a1ede1ac046f05710297aa40986642b.tar.gz hdf5-8e391ad35a1ede1ac046f05710297aa40986642b.tar.bz2 | |
[svn-r6269] Purpose:
Code cleanup
Description:
Various code cleanups to allow the development branch to be compiled with
a C++ compiler (i.e. CC=g++ )
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
FreeBSD 4.7 (sleipnir) C++
Diffstat (limited to 'perform')
| -rw-r--r-- | perform/chunk.c | 2 | ||||
| -rw-r--r-- | perform/zip_perf.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/perform/chunk.c b/perform/chunk.c index f74397b..717858b 100644 --- a/perform/chunk.c +++ b/perform/chunk.c @@ -33,7 +33,7 @@ #endif -#ifndef H5_HAVE_ATTRIBUTE +#if !defined(H5_HAVE_ATTRIBUTE) || defined __cplusplus # undef __attribute__ # define __attribute__(X) /*void*/ # define UNUSED /*void*/ diff --git a/perform/zip_perf.c b/perform/zip_perf.c index 9514dc0..d5ea5cb 100644 --- a/perform/zip_perf.c +++ b/perform/zip_perf.c @@ -324,7 +324,7 @@ uncompress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, static void get_unique_name(void) { - const char *prefix = "/tmp", *template = "/zip_perf_XXXXXX"; + const char *prefix = "/tmp", *templte = "/zip_perf_XXXXXX"; const char *env = getenv("HDF5_PREFIX"); if (env) @@ -333,13 +333,13 @@ get_unique_name(void) if (option_prefix) prefix = option_prefix; - filename = calloc(1, strlen(prefix) + strlen(template) + 1); + filename = calloc(1, strlen(prefix) + strlen(templte) + 1); if (!filename) error("out of memory"); strcpy(filename, prefix); - strcat(filename, template); + strcat(filename, templte); output = mkstemp(filename); if (output == -1) |