Author: sebor
Date: Tue Mar 28 17:16:04 2006
New Revision: 389649
URL: http://svn.apache.org/viewcvs?rev=389649&view=rev
Log:
2006-03-28 Martin Sebor <[EMAIL PROTECTED]>
* cwchar (mbrlen, mbrtowc, ...): Used _RWSTD_MBSTATE_T instead
of mbstate_t.
* _mbstate.h (_RWSTD_NO_STD_MBSTATE_T): Undefined when not using
HP aCC on HP-UX (i.e., for gcc).
Modified:
incubator/stdcxx/trunk/include/ansi/cwchar
incubator/stdcxx/trunk/include/rw/_mbstate.h
Modified: incubator/stdcxx/trunk/include/ansi/cwchar
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/ansi/cwchar?rev=389649&r1=389648&r2=389649&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/ansi/cwchar (original)
+++ incubator/stdcxx/trunk/include/ansi/cwchar Tue Mar 28 17:16:04 2006
@@ -7,16 +7,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. 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. 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.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * 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
+ *
+ * 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.
*
**************************************************************************/
@@ -422,7 +428,7 @@
} // namespace std
-extern "C" size_t mbrlen (const char*, size_t, mbstate_t*);
+extern "C" size_t mbrlen (const char*, size_t, _RWSTD_MBSTATE_T*);
namespace std {
@@ -437,7 +443,7 @@
} // namespace std
-extern "C" size_t mbrtowc (wchar_t*, const char*, size_t, mbstate_t*);
+extern "C" size_t mbrtowc (wchar_t*, const char*, size_t, _RWSTD_MBSTATE_T*);
namespace std {
@@ -452,7 +458,7 @@
} // namespace std
-extern "C" int mbsinit (const mbstate_t*);
+extern "C" int mbsinit (const _RWSTD_MBSTATE_T*);
namespace std {
@@ -467,7 +473,7 @@
} // namespace std
-extern "C" size_t mbsrtowcs (wchar_t*, const char**, size_t, mbstate_t*);
+extern "C" size_t mbsrtowcs (wchar_t*, const char**, size_t,
_RWSTD_MBSTATE_T*);
namespace std {
@@ -482,7 +488,7 @@
} // namespace std
-extern "C" size_t wcrtomb (char*, wchar_t, mbstate_t*);
+extern "C" size_t wcrtomb (char*, wchar_t, _RWSTD_MBSTATE_T*);
namespace std {
@@ -903,7 +909,7 @@
} // namespace std
-extern "C" size_t wcsrtombs (char*, const wchar_t**, size_t, mbstate_t*);
+extern "C" size_t wcsrtombs (char*, const wchar_t**, size_t,
_RWSTD_MBSTATE_T*);
namespace std {
Modified: incubator/stdcxx/trunk/include/rw/_mbstate.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_mbstate.h?rev=389649&r1=389648&r2=389649&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_mbstate.h (original)
+++ incubator/stdcxx/trunk/include/rw/_mbstate.h Tue Mar 28 17:16:04 2006
@@ -9,16 +9,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. 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. 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.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 2004-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
+ *
+ * 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.
*
**************************************************************************/
@@ -73,6 +79,7 @@
} // namespace std
+# undef _RWSTD_NO_STD_MBSTATE_T
# define _RWSTD_MBSTATE_T _STD::mbstate_t
# else // if !(HP aCC -AA)
