mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-04-06 18:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

added guards for header files that needed them

Browse Source
This commit is contained in:
Ed Hartnett 2018-01-17 09:20:20 -07:00
parent 9949a11155
commit cf92670687
9 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rnd.h
View File

@ -7,8 +7,8 @@
* Glenn Davis, 1996
*/
#ifndef _RND_
#define _RND_
#ifndef _RND_H
#define _RND_H
/* useful for aligning memory */
#define _RNDUP(x, unit) ((((x) + (unit) - 1) / (unit)) \
@ -19,4 +19,4 @@
#define M_RNDUP(x) _RNDUP(x, M_RND_UNIT)
#define M_RNDDOWN(x) __RNDDOWN(x, M_RND_UNIT)
#endif /* _RND_ */
#endif /* _RND_H */

1
ncdap_test/t_dap3a.c
View File

@ -113,7 +113,6 @@ int main()
int ncstat = NC_NOERR;
char url[8102];
const char* topsrcdir;
size_t len;
#ifndef USE_NETCDF4
int i,j;
#endif

6
ncdump/indent.h
View File

@ -1,8 +1,10 @@
/*********************************************************************
* Copyright 2007, UCAR/Unidata
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
* $Header: /upc/share/CVS/netcdf-3/ncdump/indent.h,v 1.1 2007/05/20 20:42:30 russ Exp $
* Russ Rew
*********************************************************************/
#ifndef _INDENT_H
#define _INDENT_H
#ifdef __cplusplus
extern "C" {
@ -18,3 +20,5 @@ extern int indent_get(); /* return current indent */
#ifdef __cplusplus
}
#endif
#endif /* _INDENT_H */

6
ncdump/isnan.h
View File

@ -1,8 +1,10 @@
/*********************************************************************
* Copyright 2008, University Corporation for Atmospheric Research
* See netcdf/README file for copying and redistribution conditions.
* $Id: isnan.h,v 1.3 2008/04/23 22:05:00 russ Exp $
* Russ Rew
*********************************************************************/
#ifndef _ISNAN_H
#define _ISNAN_H
#include "config.h"
@ -20,3 +22,5 @@
#if ! (defined(isfinite) || HAVE_DECL_ISFINITE)
#define isfinite(x) (!(isinf(x)||isnan(x)))
#endif /* !HAVE_DECL_ISFINITE */
#endif /* _ISNAN_H */

2
ncdump/ncdump.c
View File

@ -273,7 +273,7 @@ kind_string(int kind)
case NC_FORMAT_NETCDF4_CLASSIC:
return "netCDF-4 classic model";
default:
error("unrecognized file format: %d");
error("unrecognized file format: %d", kind);
return "unrecognized";
}
}

7
ncdump/nctime0.h
View File

@ -1,8 +1,10 @@
/*********************************************************************
* Copyright 2008, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
* $Id: nctime.h,v 1.6 2010/03/18 19:24:26 russ Exp $
* Russ Rew
*********************************************************************/
#ifndef _NCTIME0_H
#define _NCTIME0_H
#include "nctime.h"
@ -12,3 +14,6 @@ extern int is_valid_time_unit(const char *units);
extern int is_bounds_att(ncatt_t *attp);
extern void get_timeinfo(int ncid, int varid, ncvar_t *vp);
extern void print_att_times(int ncid, int varid, const ncatt_t *att);
#endif /* _NCTIME0_H */

5
ncdump/utils.h
View File

@ -5,6 +5,8 @@
* Stuff that's common to both ncdump and nccopy
*
*********************************************************************/
#ifndef _UTILS_H
#define _UTILS_H
#include "config.h"
@ -157,3 +159,6 @@ extern int getrootid(int grpid);
#ifdef __cplusplus
}
#endif
#endif /* _UTILS_H */

6
ncdump/vardata.h
View File

@ -1,8 +1,10 @@
/*********************************************************************
* Copyright 1993, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
* $Header: /upc/share/CVS/netcdf-3/ncdump/vardata.h,v 1.7 2007/10/08 02:47:57 russ Exp $
* Russ Rew
*********************************************************************/
#ifndef _VARDATA_H
#define _VARDATA_H
extern char *progname; /* for error messages */
@ -43,3 +45,5 @@ extern void pr_any_att_vals( const ncatt_t *attp, const void *vals );
#ifdef __cplusplus
}
#endif
#endif /* _VARDATA_H */

6
ncgen/nc_iter.h
View File

@ -4,8 +4,8 @@
* "$Id $"
*********************************************************************/
#ifndef _NC_ITER_
#define _NC_ITER_
#ifndef _NC_ITER_H
#define _NC_ITER_H
#include <netcdf.h>
@ -49,4 +49,4 @@ nc_next_iter(nciter_t *iterp, size_t *start, size_t *count);
}
#endif
#endif /* _NC_ITER_ */
#endif /* _NC_ITER_H */