summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-09-13 15:41:23 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-09-13 15:41:23 (GMT)
commitfd7fb6eff2eb979a331277d21ae3d5adfb30dfd8 (patch)
tree5fe95ec003dbfff39aca9928e407f7ed89740212 /src
parent85481daf07b86de1fb1773fba9352283baea4113 (diff)
downloadhdf5-fd7fb6eff2eb979a331277d21ae3d5adfb30dfd8.zip
hdf5-fd7fb6eff2eb979a331277d21ae3d5adfb30dfd8.tar.gz
hdf5-fd7fb6eff2eb979a331277d21ae3d5adfb30dfd8.tar.bz2
[svn-r19374] [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 6c0b264..df2ce6f 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 */