mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-03-31 17:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

cywin-mingw32 dlls now building

Browse Source
This commit is contained in:
Ed Hartnett 2011-01-06 20:12:06 +00:00
parent 5c636ce828
commit 1a3ba4a6d8
5 changed files with 7 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -974,9 +974,8 @@ AM_CONDITIONAL(BUILD_CXX, [test "x$nc_build_cxx" = xyes])
# Set up libtool.
AC_MSG_NOTICE([setting up libtool])
LT_PREREQ([2.4])
#LT_INIT
#LT_INIT(win32-dll)
AC_PROG_LIBTOOL
LT_INIT(win32-dll)
#AC_PROG_LIBTOOL
# Valgrind tests don't work with shared builds because of some libtool
# weirdness.

2
include/netcdf.h
View File

@ -356,7 +356,7 @@ extern "C" {
# else
# define MSC_EXTRA __declspec(dllimport)
# endif
#include <io.h>
/*#include <io.h>*/
/*#define lseek _lseeki64
#define off_t __int64*/
#else

4
liblib/Makefile.am
View File

@ -15,6 +15,10 @@ lib_LTLIBRARIES = libnetcdf.la
libnetcdf_la_LIBADD =
if BUILD_DLL
libnetcdf_la_LDFLAGS = -no-undefined
endif # BUILD_DLL
# The v2 API...
if BUILD_V2
libnetcdf_la_LIBADD += ${top_builddir}/libdispatch/libnetcdf2.la

8
libsrc/ncx.h
View File

@ -44,14 +44,6 @@ typedef unsigned char uchar;
#define CRAYFLOAT 1 /* CRAY Floating point */
#endif
#if defined(DLL_NETCDF) /* define when library is a DLL */
#include <io.h>
#define lseek _lseeki64
#define off_t __int64
#define _OFF_T_DEFINED
#endif /* defined(DLL_NETCDF) */
/*
* The integer return code for the conversion routines
* is 0 (ENOERR) when no error occured, or NC_ERANGE as appropriate

45
nc_test/tests.h
View File

@ -430,51 +430,6 @@ void check_atts(int ncid);
void check_file(char *filename);
/*
* These functions are defined in ../libsrc and are
* used to support interface version 2 backward compatiblity.
* They are not really public, but we wrote these tests before
* we decided to hide them.
* N.B. there is potential for these declarations to get
* out of sync with those in ../libsrc/nc.h and the definitions.
*/
extern int
nctypelen(nc_type datatype);
extern int
nc_put_var1(int ncid, int varid, const size_t *index, const void *value);
extern int
nc_get_var1(int ncid, int varid, const size_t *index, void *value);
extern int
nc_put_vara(int ncid, int varid,
const size_t *start, const size_t *count, const void *value);
extern int
nc_get_vara(int ncid, int varid,
const size_t *start, const size_t *count, void *value);
extern int
nc_put_vars(int ncid, int varid,
const size_t *start, const size_t *count, const ptrdiff_t *stride,
const void * value);
extern int
nc_get_vars(int ncid, int varid,
const size_t *start, const size_t *count, const ptrdiff_t *stride,
void * value);
extern int
nc_put_varm(int ncid, int varid,
const size_t *start, const size_t *count, const ptrdiff_t *stride,
const ptrdiff_t * map, const void *value);
extern int
nc_get_varm(int ncid, int varid,
const size_t *start, const size_t *count, const ptrdiff_t *stride,
const ptrdiff_t * map, void *value);
#ifdef __cplusplus
}
#endif