Commit accac67f authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Fix merge artifacts.

parent dc496549
......@@ -76,7 +76,7 @@ grid_t;
void grid_init(grid_t *gridptr);
void grid_free(grid_t *gridptr);
int gridSize(void);
unsigned cdiGridCount(void);
const double *gridInqXvalsPtr(int gridID);
const double *gridInqYvalsPtr(int gridID);
......@@ -88,7 +88,7 @@ const double *gridInqAreaPtr(int gridID);
int gridCompare(int gridID, const grid_t *grid);
int gridGenerate(const grid_t *grid);
void gridGetIndexList( int, int * );
void cdiGridGetIndexList(unsigned, int * );
gridUnpack(char * unpackBuffer, int unpackBufferSize,
......@@ -3,8 +3,6 @@
void zaxisGetTypeDescription(int zaxisType, int* outPositive, const char** outName, const char** outLongName, const char** outStdName, const char** outUnit); //The returned const char* point to static storage. Don't free or modify them.
int zaxisSize(void);
unsigned cdiZaxisCount(void);
void cdiZaxisGetIndexList(unsigned numIDs, int IDs[numIDs]);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment