i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This should fix the build of libroot.so, patch by Korli.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15067 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-11-22 14:16:20 +00:00
parent b095201503
commit bf9979bdaa
3 changed files with 1 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/Jamfile
+1
View File
@@ -148,6 +148,7 @@ local librootObjects =
posix_gnu_stdio.o posix_gnu_stdio.o
posix_gnu_stdlib.o posix_gnu_stdlib.o
posix_gnu_wcsmbs.o posix_gnu_wcsmbs.o
posix_gnu_wctype.o
posix_stdlib.o posix_stdlib.o
posix_string.o posix_string.o
posix_sys.o posix_sys.o
src/system/libroot/posix/stdlib/Jamfile
-1
View File
@@ -14,7 +14,6 @@ KernelMergeObject posix_stdlib.o :
heapsort.c heapsort.c
merge.c merge.c
mktemp.c mktemp.c
# multibyte.c
qsort.c qsort.c
radixsort.c radixsort.c
rand.c rand.c
src/system/libroot/posix/stdlib/multibyte.c
-117
View File
@@ -1,117 +0,0 @@
/*
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <stdlib.h>
/*
* Stub multibyte character functions.
* This cheezy implementation is fixed to the native single-byte
* character set.
*/
int
mblen(const char *s, size_t n)
{
if (s == NULL || *s == '\0')
return 0;
if (n == 0)
return -1;
return 1;
}
int
mbtowc(wchar_t *pwc, const char *s, size_t n)
{
if (s == NULL)
return 0;
if (n == 0)
return -1;
if (pwc)
*pwc = (wchar_t) *s;
return (*s != '\0');
}
int
wctomb(char *s, wchar_t wchar)
{
if (s == NULL)
return 0;
*s = (char) wchar;
return 1;
}
size_t
mbstowcs(wchar_t *pwcs, const char *s, size_t n)
{
int count = 0;
if (n != 0) {
do {
if ((*pwcs++ = (wchar_t) *s++) == 0)
break;
count++;
} while (--n != 0);
}
return count;
}
size_t
wcstombs(char *s, const wchar_t *pwcs, size_t n)
{
int count = 0;
if (n != 0) {
do {
if ((*s++ = (char) *pwcs++) == 0)
break;
count++;
} while (--n != 0);
}
return count;
}