Author: sebor
Date: Mon Oct 15 15:38:42 2007
New Revision: 584948
URL: http://svn.apache.org/viewvc?rev=584948&view=rev
Log:
2007-10-15 Martin Sebor <[EMAIL PROTECTED]>
* branches/4.2.0: Merged changes required to port to EDG eccp.
* branches/4.2.0/include/rw/_config-eccp.h: from trunk at rev 583987.
* branches/4.2.0/include/ansi/_cerrno.h: from trunk at rev 583997.
* branches/4.2.0/src/file.cpp: from trunk at rev 583990.
* branches/4.2.0/etc/config/src/WCHAR_T.cpp: from trunk at rev 583980.
Modified:
incubator/stdcxx/branches/4.2.0/etc/config/src/WCHAR_T.cpp
incubator/stdcxx/branches/4.2.0/include/ansi/_cerrno.h
incubator/stdcxx/branches/4.2.0/include/rw/_config-eccp.h
incubator/stdcxx/branches/4.2.0/src/file.cpp
Modified: incubator/stdcxx/branches/4.2.0/etc/config/src/WCHAR_T.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/src/WCHAR_T.cpp?rev=584948&r1=584947&r2=584948&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/src/WCHAR_T.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/src/WCHAR_T.cpp Mon Oct 15
15:38:42 2007
@@ -24,8 +24,11 @@
#include "config.h"
-#ifndef _RWSTD_NO_WCHAR_H
-# include <wchar.h>
-#endif // _RWSTD_NO_WCHAR_H
+#ifdef _RWSTD_NO_NATIVE_WCHAR_T
+# ifndef _RWSTD_NO_WCHAR_H
+# include <wchar.h>
+# endif // _RWSTD_NO_WCHAR_H
+#endif // _RWSTD_NO_NATIVE_WCHAR_T
+
wchar_t c = L'\0';
Modified: incubator/stdcxx/branches/4.2.0/include/ansi/_cerrno.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/ansi/_cerrno.h?rev=584948&r1=584947&r2=584948&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/ansi/_cerrno.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/ansi/_cerrno.h Mon Oct 15 15:38:42
2007
@@ -23,7 +23,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 2005-2007 Rogue Wave Software, Inc.
*
**************************************************************************/
@@ -40,18 +40,12 @@
extern "C" {
-extern int errno;
-
extern int* __errno_location ();
-#ifdef _RWSTD_REENTRANT
- // 17.4.1.2, p5 - errno may be a macro
- // lwg issue 310 - errno must be a macro
-# define errno (*_STD::__errno_location ())
-#else // if !defined (_RWSTD_REENTRANT)
-# define errno _STD::errno
-#endif // _RWSTD_REENTRANT
+ // 17.4.1.2, p5 - errno may be a macro
+ // lwg issue 310 - errno must be a macro
+#define errno (*_STD::__errno_location ())
#define EDOM 33
Modified: incubator/stdcxx/branches/4.2.0/include/rw/_config-eccp.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_config-eccp.h?rev=584948&r1=584947&r2=584948&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_config-eccp.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_config-eccp.h Mon Oct 15
15:38:42 2007
@@ -9,22 +9,23 @@
*
***************************************************************************
*
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at
*
- * Copyright 1994-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
*
**************************************************************************/
@@ -57,3 +58,6 @@
#ifndef _RWSTD_NO_MBSTATE_T
# define _RWSTD_NO_MBSTATE_T
#endif // _RWSTD_NO_MBSTATE_T
+
+#undef _RWSTD_NO_DEPRECATED_C_HEADERS
+#undef _RWSTD_NO_PURE_C_HEADERS
Modified: incubator/stdcxx/branches/4.2.0/src/file.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/file.cpp?rev=584948&r1=584947&r2=584948&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/file.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/file.cpp Mon Oct 15 15:38:42 2007
@@ -1,6 +1,6 @@
/**************************************************************************
*
- * support.cpp - definition of support functions and objects
+ * file.cpp - definition of file I/O helper functions
*
* $Id$
*
@@ -22,7 +22,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*
- * Copyright 1994-2005 Rogue Wave Software.
+ * Copyright 2002-2005, 2007 Rogue Wave Software, Inc.
*
**************************************************************************/
@@ -85,7 +85,8 @@
#endif // _RWSTD_NO_MKSTEMP[_IN_LIBC]
-#if defined (_RWSTD_NO_FILENO) && !defined (_RWSTD_NO_FILENO_IN_LIBC)
+#if defined (_RWSTD_NO_FILENO) && !defined (_RWSTD_NO_FILENO_IN_LIBC) \
+ || !defined (_RWSTD_NO_PURE_C_HEADERS)
// declare fileno in case it's not declared (for strict ANSI conformance)
extern "C" {
@@ -96,7 +97,7 @@
} // extern "C"
-#endif // _RWSTD_NO_FILENO && !_RWSTD_NO_FILENO_IN_LIBC
+#endif // _NO_FILENO && !_NO_FILENO_IN_LIBC || !_NO_PURE_C_HEADERS
_RWSTD_NAMESPACE (__rw) {
