Author: sebor
Date: Fri Jun 1 17:22:08 2007
New Revision: 543675
URL: http://svn.apache.org/viewvc?view=rev&rev=543675
Log:
2007-06-01 Martin Sebor <[EMAIL PROTECTED]>
STDCXX-431
* string.h (memchr): Added declaration and definition when
the function is not declared in the system string.h header.
Modified:
incubator/stdcxx/trunk/include/ansi/string.h
Modified: incubator/stdcxx/trunk/include/ansi/string.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/ansi/string.h?view=diff&rev=543675&r1=543674&r2=543675
==============================================================================
--- incubator/stdcxx/trunk/include/ansi/string.h (original)
+++ incubator/stdcxx/trunk/include/ansi/string.h Fri Jun 1 17:22:08 2007
@@ -2,20 +2,27 @@
*
* string.h
*
- * $Id: //stdlib/dev/include/ansi/string.h#15 $
+ * $Id$
*
***************************************************************************
*
- * 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.
+ * 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
+ *
+ * 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 1994-2005 Rogue Wave Software.
*
**************************************************************************/
@@ -90,6 +97,20 @@
# undef strncat
# undef strncmp
# undef strncpy
+
+
+#if defined (_RWSTD_NO_MEMCHR) && !defined (_RWSTD_NO_MEMCHR_IN_LIBC)
+
+extern "C" void* memchr (void*, int, _RWSTD_SIZE_T);
+
+inline const void* memchr (const void *__s, int __c, _RWSTD_SIZE_T __n)
+{
+ return memchr (_RWSTD_CONST_CAST (void*, __s), __c, __n);
+}
+
+# undef _RWSTD_NO_MEMCHR
+
+#endif // _RWSTD_NO_MEMCHR && !_RWSTD_NO_MEMCHR_IN_LIBC
#if defined (_RWSTD_NO_STRCHR) && !defined (_RWSTD_NO_STRCHR_IN_LIBC)
