Merge branch 'plugins.dmh' of github.com:Unidata/netcdf-c into plugins.dmh

This commit is contained in:
Ward Fisher 2018-01-16 22:13:44 -06:00
commit cf53df8f25
2 changed files with 5 additions and 5 deletions

View File

@ -13,7 +13,7 @@
#include "h5misc.h"
#undef DEBUG
#undef DEBUG
static int paramcheck(size_t nparams, const unsigned int* params);
static void byteswap8(unsigned char* mem);
@ -109,7 +109,7 @@ paramcheck(size_t nparams, const unsigned int* params)
if(nparams != 14) {
fprintf(stderr,"Too few parameters: need=16 sent=%ld\n",(unsigned long)nparams);
return 0;
}
}
for(i=0;i<nparams;i++) {
switch (i) {
@ -140,7 +140,7 @@ paramcheck(size_t nparams, const unsigned int* params)
i++; /* takes two parameters */
if(bigendian)
byteswap8((unsigned char*)&x);
#ifdef _MSC_VER
#if defined _MSC_VER || defined __APPLE__
#define DBLVAL 12345678.12345678
#else
#define DBLVAL 12345678.12345678d

View File

@ -14,7 +14,7 @@ include $(top_srcdir)/lib_flags.am
# Note which tests depend on other tests. necessary for make -j check
TEST_EXTENSIONS = .sh
extradir=
# Link to our assembled library.
AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la
@ -124,7 +124,7 @@ endif
# Filter Tests (requires ncdump and ncgen)
if ENABLE_FILTER_TESTING
if BUILD_UTILITIES
check_PROGRAMS += test_filter test_filter_misc
extra_PROGRAMS = test_filter test_filter_misc
TESTS += tst_filter.sh
endif
endif