Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dll builds under mingw-w64 #2290

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix dll builds under mingw-w64 #2290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bebfaa7
Define NC4_show_metadata in tst_udf on mingw-w64
mjwoods Apr 12, 2022
c1377c1
Use getoptions from tst_utils.c
mjwoods Apr 12, 2022
991de86
Fix external definitions in tests of netcdf dll
mjwoods Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nc_test4/tst_udf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#define FILE_NAME "tst_udf.nc"

#ifdef _MSC_VER
#ifdef _WIN32
static int
NC4_no_show_metadata(int ncid)
{
Expand Down
44 changes: 22 additions & 22 deletions nczarr_test/tst_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,28 +55,28 @@ typedef struct Odometer {
size_t index[NC_MAX_VAR_DIMS]; /* current value of the odometer*/
} Odometer;

EXTERNL Odometer* odom_new(size_t rank, const size_t* start, const size_t* stop, const size_t* stride, const size_t* max);
EXTERNL void odom_free(Odometer* odom);
EXTERNL int odom_more(Odometer* odom);
EXTERNL int odom_next(Odometer* odom);
EXTERNL size_t* odom_indices(Odometer* odom);
EXTERNL size_t odom_offset(Odometer* odom);
EXTERNL const char* odom_print1(Odometer* odom, int isshort);
EXTERNL const char* odom_print(Odometer* odom);
EXTERNL const char* odom_printshort(Odometer* odom);

EXTERNL int parsevector(const char* s0, size_t* vec);
EXTERNL const char* filenamefor(const char* f0);
EXTERNL const char* printvector(int rank, const size_t* vec);
EXTERNL const char* printvector64(int rank, const size64_t* vec);

EXTERNL int getoptions(int* argcp, char*** argvp);
EXTERNL int getmetadata(int create);
EXTERNL void cleanup(void);
extern Odometer* odom_new(size_t rank, const size_t* start, const size_t* stop, const size_t* stride, const size_t* max);
extern void odom_free(Odometer* odom);
extern int odom_more(Odometer* odom);
extern int odom_next(Odometer* odom);
extern size_t* odom_indices(Odometer* odom);
extern size_t odom_offset(Odometer* odom);
extern const char* odom_print1(Odometer* odom, int isshort);
extern const char* odom_print(Odometer* odom);
extern const char* odom_printshort(Odometer* odom);

extern int parsevector(const char* s0, size_t* vec);
extern const char* filenamefor(const char* f0);
extern const char* printvector(int rank, const size_t* vec);
extern const char* printvector64(int rank, const size64_t* vec);

extern int getoptions(int* argcp, char*** argvp);
extern int getmetadata(int create);
extern void cleanup(void);

EXTERNL int nc__testurl(const char*,char**);

EXTERNL const char* ncz_gets3testurl(void);
extern const char* ncz_gets3testurl(void);

static void
report(int err, int lineno)
Expand All @@ -85,8 +85,8 @@ report(int err, int lineno)
exit(1);
}

EXTERNL Options* options;
EXTERNL Metadata* meta;
EXTERNL NClist* capture;
extern Options* options;
extern Metadata* meta;
extern NClist* capture;

#endif /*TST_UTILS_H*/