diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-16 03:13:52 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-16 03:13:52 (GMT) |
| commit | 288c7760a4a55d56df7a9019a8522625e305b9b7 (patch) | |
| tree | 45f89de4d98a01416f27ada601a6d7fff6e49a82 /perform | |
| parent | f5689224b5faaf01c02a1a4ae2a0a71b9f46e1d0 (diff) | |
| download | hdf5-288c7760a4a55d56df7a9019a8522625e305b9b7.zip hdf5-288c7760a4a55d56df7a9019a8522625e305b9b7.tar.gz hdf5-288c7760a4a55d56df7a9019a8522625e305b9b7.tar.bz2 | |
[svn-r24803] Description:
Rename GCC_DIAG_OFF/ON macros to H5_GCC_DIAG_OFF/ON and move from
src/H5private.h to src/H5public.h. Wrap typedef of hsize_t and hssize_t
in DIAG_OFF(long-long) macros.
Clean up a bunch of "macro '-' is unused" warnings.
Tested on:
Mac OSX/64 10.9.2 (amazon) w/gcc 4.8.2, C++, FORTRAN, parallel
(too minor to require h5committest)
Diffstat (limited to 'perform')
| -rw-r--r-- | perform/sio_engine.c | 12 | ||||
| -rw-r--r-- | perform/zip_perf.c | 6 |
2 files changed, 0 insertions, 18 deletions
diff --git a/perform/sio_engine.c b/perform/sio_engine.c index 4ce3aa0..0ab5c3e 100644 --- a/perform/sio_engine.c +++ b/perform/sio_engine.c @@ -38,22 +38,14 @@ /* Macro definitions */ /* sizes of various items. these sizes won't change during program execution */ -/* The following three must have the same type */ -#define ELMT_SIZE (sizeof(unsigned char)) /* we're doing bytes */ #define ELMT_H5_TYPE H5T_NATIVE_UCHAR #define GOTOERROR(errcode) { ret_code = errcode; goto done; } -#define GOTODONE { goto done; } #define ERRMSG(mesg) { \ fprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n", \ mesg, (int)__LINE__, __FILE__); \ } -#define MSG(mesg) { \ - fprintf(stderr, "(%s) at line %4d in %s\n", \ - mesg, (int)__LINE__, __FILE__); \ -} - /* verify: if val is false (0), print mesg. */ #define VRFY(val, mesg) do { \ if (!val) { \ @@ -81,10 +73,6 @@ static int clean_file_g = -1; /*whether to cleanup temporary test */ /*files. -1 is not defined; */ /*0 is no cleanup; 1 is do cleanup */ -#ifndef MIN -# define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif /* !MIN */ - /* the different types of file descriptors we can expect */ typedef union _file_descr { int posixfd; /* POSIX file handle*/ diff --git a/perform/zip_perf.c b/perform/zip_perf.c index f76e10b..edd5b0f 100644 --- a/perform/zip_perf.c +++ b/perform/zip_perf.c @@ -32,19 +32,13 @@ #ifdef VMS # define unlink delete -# define GZ_SUFFIX "-gz" #endif /* VMS */ #ifdef RISCOS # define unlink remove -# define GZ_SUFFIX "-gz" # define fileno(file) file->__file #endif /* RISCOS */ -#ifndef GZ_SUFFIX -# define GZ_SUFFIX ".gz" -#endif /* GZ_SUFFIX */ - #define ONE_KB 1024 #define ONE_MB (ONE_KB * ONE_KB) #define ONE_GB (ONE_MB * ONE_KB) |