diff options
Diffstat (limited to 'src/hdf5gen.h')
| -rw-r--r-- | src/hdf5gen.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/hdf5gen.h b/src/hdf5gen.h index 39e3d05..628f5c3 100644 --- a/src/hdf5gen.h +++ b/src/hdf5gen.h @@ -15,6 +15,7 @@ /* * This file contains general macros used throughout HDF5 library & interfaces */ +#include "hdf5pabl.h" #ifndef HDF5GEN_H #define HDF5GEN_H @@ -36,6 +37,11 @@ # define TRUE (!FALSE) #endif +/* number of members in an array */ +#ifndef NELMTS +# define NELMTS(X) (sizeof(X)/sizeof(X[0])) +#endif + /*------------------------------------------------------------------------- * Purpose: Register function entry for library initialization and code * profiling. @@ -77,9 +83,9 @@ */ #define FUNC_ENTER(func_name,interface_init_func,err) \ CONSTR (FUNC, #func_name); \ - /* int pablo_func_id = ID_ ## func_name; */ \ + PABLO_SAVE (ID_ ## func_name); \ \ - PABLO_TRACE_ON (PABLO_MASK, ID_ ## func_name); \ + PABLO_TRACE_ON (PABLO_MASK, pablo_func_id); \ \ if (!library_initialize_g) { \ library_initialize_g = TRUE; \ @@ -120,10 +126,7 @@ * *------------------------------------------------------------------------- */ -#define FUNC_LEAVE(return_value) { \ - PABLO_TRACE_OFF (PABLO_MASK, pablo_func_id); \ - return (return_value); \ -} +#define FUNC_LEAVE(return_value) HRETURN(return_value) #endif /* HDF5GEN_H */ |