From 39f1c8b7b076167fff9a00813bdb006aaa589ea4 Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Mon, 8 Mar 2021 14:27:56 -0700 Subject: [PATCH] fix cmake error --- include/ncpathmgr.h | 3 +++ libdispatch/dinfermodel.c | 2 +- ncdump/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/ncpathmgr.h b/include/ncpathmgr.h index 8a92f647d..c614cd592 100644 --- a/include/ncpathmgr.h +++ b/include/ncpathmgr.h @@ -97,6 +97,9 @@ EXTERNL char* NCpathcvt(const char* path); /* Canonicalize and make absolute by prefixing the current working directory */ EXTERNL char* NCpathabsolute(const char* name); +/* Check if this path appears to start with a windows drive letter */ +EXTERNL int NChasdriveletter(const char* path); + /* Convert from the local coding (e.g. ANSI) to utf-8; note that this can produce unexpected results for Windows because it first converts to wide character and then to utf8. */ diff --git a/libdispatch/dinfermodel.c b/libdispatch/dinfermodel.c index 2b7ff2185..a666d0cf3 100644 --- a/libdispatch/dinfermodel.c +++ b/libdispatch/dinfermodel.c @@ -44,7 +44,7 @@ struct MagicFile { struct NCURI* uri; int omode; NCmodel* model; - fileoffset_t filelen; + size64_t filelen; int use_parallel; void* parameters; /* !NULL if inmemory && !diskless */ FILE* fp; diff --git a/ncdump/CMakeLists.txt b/ncdump/CMakeLists.txt index e6e7148f9..93354bf53 100644 --- a/ncdump/CMakeLists.txt +++ b/ncdump/CMakeLists.txt @@ -317,7 +317,7 @@ IF(ENABLE_TESTS) add_sh_test(ncdump test_keywords) ENDIF() - IF(USE_CDF5) + IF(USE_HDF5) add_sh_test(ncdump test_scope) ENDIF()