mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved previously defined macros out of meta.h and back into netcdf.h, so that we don't break the just-released netcdf-fortran release.

Browse Source
This commit is contained in:
Ward Fisher 2014-09-24 10:22:40 -06:00
parent f595aec24a
commit 36ca7ca972
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/netcdf.h
View File

@ -1919,6 +1919,17 @@ ncrecput(int ncid, long recnum, void *const *datap);
#define END_OF_MAIN()
#endif
/* 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 /*!< rename_grp() support. */
#endif
#ifndef NC_HAVE_INQ_FORMAT_EXTENDED
#define NC_HAVE_INQ_FORMAT_EXTENDED /*!< inq_format_extended() support. */
#endif
#define NC_HAVE_META_H
#endif /* _NETCDF_ */

9
include/netcdf_meta.h.in
View File

@ -49,15 +49,6 @@
#define NC_HAS_PNETCDF @NC_HAS_PNETCDF@ /*!< pnetcdf support. */
#define NC_HAS_PARALLEL @NC_HAS_PARALLEL@ /*!< parallel IO support via hdf5. */
/* 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 /*!< rename_grp() support. */
#endif
#ifndef NC_HAVE_INQ_FORMAT_EXTENDED
#define NC_HAVE_INQ_FORMAT_EXTENDED /*!< inq_format_extended() support. */
#endif
#endif