Merge pull request #1030 from NetCDF-World-Domination-Council/ejh_ifdef_clean

ifdef cleanup of netcdf.h
This commit is contained in:
Ward Fisher 2018-06-30 13:34:39 -06:00 committed by GitHub
commit dca50ac4ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1798,11 +1798,6 @@ EXTERNL int
nctypelen(nc_type datatype);
/* Begin v2.4 backward compatibility */
/*
* defining NO_NETCDF_2 to the preprocessor
* turns off backward compatibility declarations.
*/
#ifndef NO_NETCDF_2
/** Backward compatible alias. */
/**@{*/
@ -1967,24 +1962,10 @@ ncrecput(int ncid, long recnum, void *const *datap);
EXTERNL int nc_finalize();
/* End v2.4 backward compatibility */
#endif /*!NO_NETCDF_2*/
#if defined(__cplusplus)
}
#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_ */