1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
Fix implicit function declarations
--- libsrc/nc.c
+++ libsrc/nc.c
@@ -15,7 +15,7 @@
# include <mpp/shmem.h>
# include <intrinsics.h>
#endif
-#ifdef HAVE_UNISTD
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
--- fortran/fort-nc4.c
+++ fortran/fort-nc4.c
@@ -30,6 +30,14 @@
/* These are in libsrc4/nc4vars.c... */
int nc_inq_var_chunking_ints(int ncid, int varid, int *contiguousp, int *chunksizesp);
int nc_def_var_chunking_ints(int ncid, int varid, int contiguous, int *chunksizes);
+int nc_set_var_chunk_cache_ints(int ncid, int varid, int size, int nelems, int preemption);
+int nc_get_var_chunk_cache_ints(int ncid, int varid, int *sizep, int *nelemsp, int *preemptionp);
+
+/* These are in libsrc4/nc4file.c... */
+int nc_set_chunk_cache_ints(int size, int nelems, int preemption);
+int nc_get_chunk_cache_ints(int *sizep, int *nelemsp, int *preemptionp);
+int nc_create_par_fortran(const char *path, int cmode, int comm, int info, int *ncidp);
+int nc_open_par_fortran(const char *path, int mode, int comm, int info, int *ncidp);
FCALLSCFUN5(NF_INT, nc_create_par_fortran, NF_CREATE_PAR, nf_create_par,
STRING, FINT2CINT, FINT2CINT, FINT2CINT, PCINT2FINT)
--- libncdap3/oc/daplex.c
+++ libncdap3/oc/daplex.c
@@ -86,6 +86,8 @@
SCAN_PROG
};
+int daperror(DAPparsestate* state, const char* msg);
+
/**************************************************/
int
--- libncdap3/oc/ocinternal.c
+++ libncdap3/oc/ocinternal.c
@@ -37,6 +37,8 @@
#endif
extern OCnode* makeunlimiteddimension(void);
+int occurlopen(CURL** curlp);
+void occurlclose(CURL* curl);
#ifdef WIN32
#include <fcntl.h>
--- libncdap3/oc/dapparse.c
+++ libncdap3/oc/dapparse.c
@@ -11,6 +11,7 @@
static OCtype octypefor(Object etype);
static char* scopeduplicates(OClist* list);
static int check_int32(char* val, long* value);
+void setwordchars(DAPlexstate* lexstate, int kind);
/****************************************************/
--- libncdap3/ncdap3.c
+++ libncdap3/ncdap3.c
@@ -4,6 +4,7 @@
* $Id$
*********************************************************************/
#include "config.h"
+#include "netcdf3.h"
#include "ncdap3.h"
#include "dispatch3.h"
#include "dapdispatch3.h"
--- libncdap3/oc/dapparselex.h
+++ libncdap3/oc/dapparselex.h
@@ -88,4 +88,5 @@
extern void daplexinit(char* input, DAPlexstate** lexstatep);
extern void daplexcleanup(DAPlexstate** lexstatep);
+void dassetup(DAPparsestate* state);
#endif /*DAPPARSELEX_H*/
|
GitWeb