Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
d41a436a
Commit
d41a436a
authored
Mar 11, 2015
by
Uwe Schulzweida
Browse files
declare gridHandle as void* if grib_api is not available
parent
da61357c
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
src/gribapi_utilities.c
View file @
d41a436a
static
int
dummy
;
#ifdef HAVE_LIBGRIB_API
#include
"gribapi_utilities.h"
...
...
src/iterator_grib.c
View file @
d41a436a
#ifdef HAVE_LIBGRIB_API
#include
"iterator_grib.h"
#include
"cdi_int.h"
...
...
@@ -17,6 +15,8 @@
#include
<string.h>
#ifdef HAVE_LIBGRIB_API
//Since the error handling in constructors is usually very closely related to the workings of a destructor,
//this function combines both functions in one, using a centralized exit.
//The mode of operation depends on whether me is a NULL pointer on entry:
...
...
@@ -127,6 +127,7 @@ char* cdiGribIterator_serialize(CdiIterator* super)
free
(
escapedPath
);
return
result
;
}
#endif
CdiGribIterator
*
cdiGribIterator_deserialize
(
const
char
*
description
)
{
...
...
@@ -170,6 +171,7 @@ fail:
return
NULL
;
}
#ifdef HAVE_LIBGRIB_API
static
void
cdiGribIterator_ensureBuffer
(
CdiGribIterator
*
me
,
size_t
requiredSize
)
{
if
(
me
->
bufferSize
<
requiredSize
)
...
...
src/iterator_grib.h
View file @
d41a436a
...
...
@@ -24,6 +24,8 @@ typedef struct CdiGribIterator {
size_t
bufferSize
,
curRecordSize
;
#ifdef HAVE_LIBGRIB_API
grib_handle
*
gribHandle
;
#else
void
*
gribHandle
;
#endif
}
CdiGribIterator
;
...
...
src/mo_cdi.f90
View file @
d41a436a
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment