[MOAB-dev] r1335 - MOAB/trunk

[dcthomp at mcs.anl.gov]

Author: dcthomp
Date: 2007-10-24 15:58:58 -0500 (Wed, 24 Oct 2007)
New Revision: 1335

Modified:
   MOAB/trunk/MBEntityHandle.h.in
   MOAB/trunk/config.h.cmake
Log:
COMP: Eliminate "HDF5_FILE redefined" warnings.


Modified: MOAB/trunk/MBEntityHandle.h.in
===================================================================
--- MOAB/trunk/MBEntityHandle.h.in	2007-10-24 20:38:48 UTC (rev 1334)
+++ MOAB/trunk/MBEntityHandle.h.in	2007-10-24 20:58:58 UTC (rev 1335)
@@ -12,7 +12,7 @@
 #ifdef HDF5_FOUND
 #  define HAVE_HDF5_H
 #endif
-#ifdef HAVE_HDF5_H
+#if defined(HAVE_HDF5_H) && !defined(HDF5_FILE)
 #  define HDF5_FILE
 #endif
 

Modified: MOAB/trunk/config.h.cmake
===================================================================
--- MOAB/trunk/config.h.cmake	2007-10-24 20:38:48 UTC (rev 1334)
+++ MOAB/trunk/config.h.cmake	2007-10-24 20:58:58 UTC (rev 1335)
@@ -105,7 +105,9 @@
 #cmakedefine HDF5_FOUND
 #ifdef HDF5_FOUND
 #  define HAVE_HDF5_H
-#  define HDF5_FILE
+#  ifndef HDF5_FILE
+#    define HDF5_FILE
+#  endif /* HDF5_FILE */
 #endif /* HDF5_FOUND */
 
 /* Use int32_t for handles */