Added definition of NC_HAVE_META_H to netcdf.h.

Moved NC_HAVE_INQ_FORMAT_EXTENDED, NC_HAVE_RENAME_GRP
to netcdf_meta.h.
This commit is contained in:
Ward Fisher 2014-09-11 15:19:02 -06:00
parent 857c77a9df
commit 302b8003b7
2 changed files with 215 additions and 224 deletions

View File

@ -1918,26 +1918,6 @@ ncrecput(int ncid, long recnum, void *const *datap);
#define END_OF_MAIN()
#endif
/* Allow dependent software to tell if
nc_rename_grp() is available, as requested
by Charlie Zender. */
#ifndef NC_HAVE_RENAME_GRP
#define NC_HAVE_RENAME_GRP
#endif
/* Allow dependent software to tell if
inq_format_extended() is available.
This is not a scalable approach to querying
the functionality of the netcdf library, but
it will do for the time being. */
#ifndef NC_HAVE_INQ_FORMAT_EXTENDED
#define NC_HAVE_INQ_FORMAT_EXTENDED
#endif
#define NC_HAVE_META_H
#endif /* _NETCDF_ */

View File

@ -27,4 +27,15 @@
#define NC_HAS_PNETCDF @NC_HAS_PNETCDF@
#define NC_HAS_PARALLEL @NC_HAS_PARALLEL@
/* Define two hard-coded functionality-related
macros, but this is not going to be
standard practice. */
#ifndef NC_HAVE_RENAME_GRP
#define NC_HAVE_RENAME_GRP
#endif
#ifndef NC_HAVE_INQ_FORMAT_EXTENDED
#define NC_HAVE_INQ_FORMAT_EXTENDED
#endif
#endif