summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2011-04-11 21:43:15 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2011-04-11 21:43:15 (GMT)
commit3fbbb862a90f49093b07abf98736b9720b38627a (patch)
treef07901f6fa3cf8d88d3d60377f2013f61dffb6b1
parente006157deb5866bf45ca0f092d42b7f9969e4209 (diff)
downloadhdf5-3fbbb862a90f49093b07abf98736b9720b38627a.zip
hdf5-3fbbb862a90f49093b07abf98736b9720b38627a.tar.gz
hdf5-3fbbb862a90f49093b07abf98736b9720b38627a.tar.bz2
[svn-r20476] Removed all references to memory.h
-rw-r--r--config/cmake/ConfigureChecks.cmake3
-rw-r--r--config/cmake/H5pubconf.h.in5
-rwxr-xr-xconfigure5
-rw-r--r--src/H5config.h.in3
-rw-r--r--tools/h5diff/h5diff_main.c1
-rw-r--r--vms/src/h5pubconf.h3
-rwxr-xr-xwindows/src/H5pubconf.h3
7 files changed, 3 insertions, 20 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 68137f9..fce4900 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -257,7 +257,6 @@ CHECK_INCLUDE_FILE_CONCAT ("sys/timeb.h" H5_HAVE_SYS_TIMEB_H)
CHECK_INCLUDE_FILE_CONCAT ("sys/types.h" H5_HAVE_SYS_TYPES_H)
CHECK_INCLUDE_FILE_CONCAT ("unistd.h" H5_HAVE_UNISTD_H)
CHECK_INCLUDE_FILE_CONCAT ("stdlib.h" H5_HAVE_STDLIB_H)
-CHECK_INCLUDE_FILE_CONCAT ("memory.h" H5_HAVE_MEMORY_H)
CHECK_INCLUDE_FILE_CONCAT ("dlfcn.h" H5_HAVE_DLFCN_H)
CHECK_INCLUDE_FILE_CONCAT ("features.h" H5_HAVE_FEATURES_H)
CHECK_INCLUDE_FILE_CONCAT ("inttypes.h" H5_HAVE_INTTYPES_H)
@@ -850,4 +849,4 @@ H5ConversionTests (H5_NO_ALIGNMENT_RESTRICTIONS "Checking IF alignment restricti
# problem converting from unsigned long long to long double */
IF (CYGWIN)
SET (H5_CYGWIN_ULLONG_TO_LDOUBLE_ROUND_PROBLEM 1)
-ENDIF (CYGWIN) \ No newline at end of file
+ENDIF (CYGWIN)
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index cd05639..df9c3a8 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -270,9 +270,6 @@
/* Define to 1 if you have the `lstat' function. */
#cmakedefine H5_HAVE_LSTAT @H5_HAVE_LSTAT@
-/* Define to 1 if you have the <memory.h> header file. */
-#cmakedefine H5_HAVE_MEMORY_H @H5_HAVE_MEMORY_H@
-
/* Define if we have MPE support */
#cmakedefine H5_HAVE_MPE @H5_HAVE_MPE@
@@ -793,4 +790,4 @@
#undef inline
#endif
-#endif \ No newline at end of file
+#endif
diff --git a/configure b/configure
index f231c94..fb56af8 100755
--- a/configure
+++ b/configure
@@ -596,9 +596,6 @@ ac_includes_default="\
# endif
#endif
#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-# include <memory.h>
-# endif
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
@@ -11007,7 +11004,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h strings.h \
inttypes.h stdint.h unistd.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/src/H5config.h.in b/src/H5config.h.in
index c53ccca..7cdc4eb 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -226,9 +226,6 @@
/* Define to 1 if you have the `lstat' function. */
#undef HAVE_LSTAT
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
/* Define if we have MPE support */
#undef HAVE_MPE
diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index 297eb48..c1538a4 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -15,7 +15,6 @@
#include <stdlib.h>
#include <assert.h>
-#include <memory.h>
#include "h5diff.h"
#include "h5diff_common.h"
#include "h5tools_utils.h"
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index e27e387..764b050 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -238,9 +238,6 @@
/* Define to 1 if you have the `lstat' function. */
/* #define H5_HAVE_LSTAT 1 */
-/* Define to 1 if you have the <memory.h> header file. */
-#define H5_HAVE_MEMORY_H 1
-
/* Define if we have MPE support */
/* #undef H5_HAVE_MPE */
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index ca7f94d..c84ebac 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -235,9 +235,6 @@
/* Define to 1 if you have the `lseek64' function. */
/* #undef H5_HAVE_LSEEK64 */
-/* Define to 1 if you have the <memory.h> header file. */
-#define H5_HAVE_MEMORY_H 1
-
/* Define if we have MPE support */
/* #undef H5_HAVE_MPE */