Merge branch 'posophe-master'

This commit is contained in:
Ward Fisher 2015-04-22 14:55:06 -06:00
commit 3f560fff3a
3 changed files with 6 additions and 4 deletions

View File

@ -667,7 +667,7 @@ done:
pxp->bf_rflags |= rflags;
pxp->bf_refcount++;
*vpp = (char *)pxp->bf_base + diff;
*vpp = (void *)((char *)pxp->bf_base + diff);
return ENOERR;
}

View File

@ -6,12 +6,10 @@
prefix=@prefix@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
cc="@CC@"
cflags=" -I${includedir} @CPPFLAGS@"
libs="-L${libdir} @NC_LIBS@"
has_dap="@HAS_DAP@"
has_nc2="@HAS_NC2@"
has_nc4="@HAS_NC4@"
@ -182,7 +180,7 @@ while test $# -gt 0; do
;;
--libs)
echo $libs
pkg-config netcdf --libs
;;
--prefix)

View File

@ -15,6 +15,10 @@
#include "ncgen.h"
#include "genlib.h"
#ifndef HAVE_STRLCAT
extern size_t strlcat(char *dst, const char *src, size_t siz);
#endif
extern int netcdf_flag;
extern int c_flag;
extern int fortran_flag;