From 0ecf47141483e63a02f8b2f3b9d9c790a3ff4b63 Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Sat, 21 Feb 2015 08:52:48 -0500
Subject: [svn-r26264] Merge of r26225 from trunk.

Removed a a work-around for a broken CodeWarrior open() call from
configure that causes a test in test/tfile.c to be skipped.

This change removes the H5_NO_SHARED_WRITING symbol.

Tested on: jam (no code changes w/ non-CodeWarrior compilers)
---
 config/cmake/H5pubconf.h.in |  3 ---
 configure                   | 12 +-----------
 configure.ac                |  9 ---------
 release_docs/RELEASE.txt    | 14 +++++++++++++-
 src/H5config.h.in           |  3 ---
 test/tfile.c                |  2 --
 6 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 79c6c1a..ef78950 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -536,9 +536,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 ed349b8..ada86a7 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac 26224 2015-02-18 23:01:17Z chaarawi .
+# From configure.ac Id: configure.ac 26263 2015-02-21 14:18:09Z derobins .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for HDF5 1.8.15-snap11.
 #
@@ -28521,16 +28521,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 ac58ecb..b65f356 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2713,15 +2713,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/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index dc452bf..879ec2d 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -77,7 +77,19 @@ New Features
     - Remove option to enable or disable large file support. It will
       always be enabled.
       (MSC - 2015/02/19 HDFFV-9097)
-    
+
+    - Removed configuration feature
+
+      When configure detected that the CodeWarrior compiler was being used it
+      would define a symbol that caused a test in test/tfile.c to be skipped
+      due to a broken CodeWarrior open() command.
+
+      Since this only masks the problem instead of fixing it and we don't
+      support CodeWarrior anyway, this functionality was removed.
+
+      (DER - 2015/02/21, HDFFV-9080)
+      
+
     Library
     -------
     - None
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 82e0182..adb063c 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -2957,9 +2957,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 */
-- 
cgit v0.12