summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-09-13 15:42:27 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-09-13 15:42:27 (GMT)
commit16fa6eef73cdc425336127a89896b387130c1f16 (patch)
treea11a8ae58991b14f9352424890bb541354c3d92d /src
parent3984f9e1ebf80e9266520540ebe81eaec7ca1e70 (diff)
downloadhdf5-16fa6eef73cdc425336127a89896b387130c1f16.zip
hdf5-16fa6eef73cdc425336127a89896b387130c1f16.tar.gz
hdf5-16fa6eef73cdc425336127a89896b387130c1f16.tar.bz2
[svn-r19375] [BZ1938] - VS2010 on windows requires stdint.h to compile C++ library. CMake will check if c++ compiler supports stdint.h and set the H5_HAVE_STDINT_H_CXX define.
Tested: windows and local linux
Diffstat (limited to 'src')
-rw-r--r--src/H5public.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/H5public.h b/src/H5public.h
index 452d832..ac1089f 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -43,9 +43,13 @@
# include <limits.h> /*for H5T_NATIVE_CHAR defn in H5Tpublic.h */
#endif
#ifndef __cplusplus
-#ifdef H5_HAVE_STDINT_H
+# ifdef H5_HAVE_STDINT_H
# include <stdint.h> /*for C9x types */
-#endif
+# endif
+#else
+# ifdef H5_HAVE_STDINT_H_CXX
+# include <stdint.h> /*for C9x types when include from C++ */
+# endif
#endif
#ifdef H5_HAVE_INTTYPES_H
# include <inttypes.h> /* For uint64_t on some platforms */