summaryrefslogtreecommitdiffstats
path: root/conversion
diff options
context:
space:
mode:
authorPeter Baumann <baumann@floridita.rasdaman>2009-10-15 23:37:09 +0200
committerwww-data <www-data@ubuntu.localdomain>2010-06-08 10:50:36 +0200
commit820c6de992657f5a7e82762784a090d2a82bd99c (patch)
tree721b6c8d40dd20e330693f9f35b2a854347a27a9 /conversion
parentd302192797e34634e607e4a42170bdb137fc934e (diff)
downloadrasdaman-upstream-820c6de992657f5a7e82762784a090d2a82bd99c.zip
rasdaman-upstream-820c6de992657f5a7e82762784a090d2a82bd99c.tar.gz
rasdaman-upstream-820c6de992657f5a7e82762784a090d2a82bd99c.tar.xz
PB: HDF changed from MAX_VAR_DIMS to H4_MAX_VAR_DIMS around 9/5/2007 to avoid potential conflicts with NetCDF-3 library
Diffstat (limited to 'conversion')
-rw-r--r--conversion/hdf.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/conversion/hdf.cc b/conversion/hdf.cc
index 5effb10..8784d42 100644
--- a/conversion/hdf.cc
+++ b/conversion/hdf.cc
@@ -63,6 +63,12 @@ rasdaman GmbH.
#error "No mfhdf.h header available."
#endif
+// HDF changed from MAX_VAR_DIMS to H4_MAX_VAR_DIMS around 9/5/2007
+// to avoid potential conflicts with NetCDF-3 library
+#ifndef H4_MAX_VAR_DIMS
+ #define H4_MAX_VAR_DIMS MAX_VAR_DIMS
+#endif
+
#include <stdio.h>
#include <iostream>
@@ -283,7 +289,7 @@ r_convDesc &r_Conv_HDF::convertFrom(const char *options) throw(r_Error)
{
char name[256];
int32 handle=0, sds_id=0, rank=0, dtype=0, numattr=0, array_size=0;
- int32 dimsizes[MAX_VAR_DIMS];
+ int32 dimsizes[H4_MAX_VAR_DIMS];
int32 *start=NULL;
int dsize=0;
size_t filesize=0;