summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-02-19 05:24:09 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-02-19 05:24:09 (GMT)
commita7f70203b41e52942c67e07b927291cc2a03ff8c (patch)
treefd926ea90e07684ed86a47f3af2a8825b2dc7709
parent32c030ad2b2451d6d71c029f1915c5149434b034 (diff)
downloadhdf5-a7f70203b41e52942c67e07b927291cc2a03ff8c.zip
hdf5-a7f70203b41e52942c67e07b927291cc2a03ff8c.tar.gz
hdf5-a7f70203b41e52942c67e07b927291cc2a03ff8c.tar.bz2
[svn-r26225] Removes broken open() call work-around that was specific to the now
unsupported Code Warrior compiler. Also removes the H5_NO_SHARED_WRITING symbol from the pubconf file. Fixes: HDFFV-9080 Tested on: jam only, after bin/reconfigure (all platforms should see no source changes)
-rw-r--r--config/cmake/H5pubconf.h.in3
-rwxr-xr-xconfigure10
-rw-r--r--configure.ac9
-rw-r--r--src/H5config.h.in3
-rw-r--r--test/tfile.c2
-rw-r--r--vms/src/h5pubconf.h3
6 files changed, 0 insertions, 30 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 8235c54..05058d2 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -540,9 +540,6 @@
/* Define if deprecated public API symbols are disabled */
#cmakedefine H5_NO_DEPRECATED_SYMBOLS @H5_NO_DEPRECATED_SYMBOLS@
-/* Define if shared writing must be disabled (CodeWarrior only) */
-#cmakedefine H5_NO_SHARED_WRITING @H5_NO_SHARED_WRITING@
-
/* Name of package */
#define H5_PACKAGE "@HDF5_PACKAGE@"
diff --git a/configure b/configure
index 3590924..c56bce8 100755
--- a/configure
+++ b/configure
@@ -28340,16 +28340,6 @@ $as_echo "#define HAVE_FILTER_SCALEOFFSET 1" >>confdefs.h
done
fi
-## ----------------------------------------------------------------------
-## This is defined only when we're using CodeWarrior, since it has a
-## broken "open()" call.
-#
-if test 1 = 2; then
-
-$as_echo "#define NO_SHARED_WRITING 1" >>confdefs.h
-
-fi
-
## --------------------------------------------------------------------------
## Should the Default Virtual File Driver be compiled?
##
diff --git a/configure.ac b/configure.ac
index a17dec8..aff469f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2531,15 +2531,6 @@ if test -n "$FILTERS"; then
done
fi
-## ----------------------------------------------------------------------
-## This is defined only when we're using CodeWarrior, since it has a
-## broken "open()" call.
-#
-if test 1 = 2; then
- AC_DEFINE([NO_SHARED_WRITING], [1],
- [Define if shared writing must be disabled (CodeWarrior only)])
-fi
-
## --------------------------------------------------------------------------
## Should the Default Virtual File Driver be compiled?
##
diff --git a/src/H5config.h.in b/src/H5config.h.in
index cc8a59c..eb18a5e 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -470,9 +470,6 @@
/* Define if deprecated public API symbols are disabled */
#undef NO_DEPRECATED_SYMBOLS
-/* Define if shared writing must be disabled (CodeWarrior only) */
-#undef NO_SHARED_WRITING
-
/* Name of package */
#undef PACKAGE
diff --git a/test/tfile.c b/test/tfile.c
index 4bef41c..5de035a 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -3652,9 +3652,7 @@ test_file(void)
test_file_create(); /* Test file creation(also creation templates)*/
test_file_open(); /* Test file opening */
-#ifndef H5_NO_SHARED_WRITING
test_file_close(); /* Test file close behavior */
-#endif /* H5_NO_SHARED_WRITING */
test_get_file_id(); /* Test H5Iget_file_id */
test_get_obj_ids(); /* Test H5Fget_obj_ids for Jira Issue 8528 */
test_file_perm(); /* Test file access permissions */
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index 6cb2612..acb95c8 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -488,9 +488,6 @@
/* Define if deprecated public API symbols are disabled */
/* #undef H5_NO_DEPRECATED_SYMBOLS */
-/* Define if shared writing must be disabled (CodeWarrior only) */
-#define H5_NO_SHARED_WRITING 1
-
/* Name of package */
#define H5_PACKAGE "hdf5"