summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorElena Pourmal <epourmal@hdfgroup.org>2004-08-25 03:44:59 (GMT)
committerElena Pourmal <epourmal@hdfgroup.org>2004-08-25 03:44:59 (GMT)
commit0a965d2236a811f66ff42df732031a150e1020ac (patch)
tree001765c51deca6aaac80cb48763a2d073869e43d /src
parent98623b2787525823f1020a291e534024cbbfe851 (diff)
downloadhdf5-0a965d2236a811f66ff42df732031a150e1020ac.zip
hdf5-0a965d2236a811f66ff42df732031a150e1020ac.tar.gz
hdf5-0a965d2236a811f66ff42df732031a150e1020ac.tar.bz2
[svn-r9154]
Purpose: Maintenance/bug fixes (OSF1 C++ and missing Fortran APIs) Description: bringing 1.6 changes to 1.7 Solution: Platforms tested: OSF1, Solaris 2.8, AIX5.1 Misc. update:
Diffstat (limited to 'src')
-rw-r--r--src/H5private.h2
-rw-r--r--src/H5public.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/H5private.h b/src/H5private.h
index d1fdf30..38484f0 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -66,9 +66,11 @@
/*
* C9x integer types
*/
+#ifndef __cplusplus
#ifdef H5_HAVE_STDINT_H
# include <stdint.h>
#endif
+#endif
/*
* The `struct stat' data type for stat() and fstat(). This is a Posix file
diff --git a/src/H5public.h b/src/H5public.h
index 9816d2e..261f580 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -41,9 +41,11 @@
#ifdef H5_STDC_HEADERS
# include <limits.h> /*for H5T_NATIVE_CHAR defn in H5Tpublic.h */
#endif
+#ifndef __cplusplus
#ifdef H5_HAVE_STDINT_H
# include <stdint.h> /*for C9x types */
#endif
+#endif
#ifdef H5_HAVE_INTTYPES_H
# include <inttypes.h> /* For uint64_t on some platforms */
#endif