[haiku-commits] r37501 - in haiku/branches/developer/zooey/posix-locale/src: system/boot system/kernel/lib system/libroot/posix/locale system/runtime_loader tests/system/libroot/posix
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 13 Jul 2010 23:47:49 +0200 (CEST)
Author: zooey
Date: 2010-07-13 23:47:49 +0200 (Tue, 13 Jul 2010)
New Revision: 37501
Changeset: http://dev.haiku-os.org/changeset/37501
Modified:
haiku/branches/developer/zooey/posix-locale/src/system/boot/Jamfile
haiku/branches/developer/zooey/posix-locale/src/system/kernel/lib/Jamfile
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMessagesData.cpp
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/LocaleData.cpp
haiku/branches/developer/zooey/posix-locale/src/system/runtime_loader/Jamfile
haiku/branches/developer/zooey/posix-locale/src/tests/system/libroot/posix/locale_test.cpp
Log:
* fix build of kernel, runtime_loader and bootloader
* fix gcc4 build
Modified: haiku/branches/developer/zooey/posix-locale/src/system/boot/Jamfile
===================================================================
--- haiku/branches/developer/zooey/posix-locale/src/system/boot/Jamfile
2010-07-13 20:03:46 UTC (rev 37500)
+++ haiku/branches/developer/zooey/posix-locale/src/system/boot/Jamfile
2010-07-13 21:47:49 UTC (rev 37501)
@@ -3,6 +3,7 @@
local librootFunctions =
abs.o
ctype.o
+ LocaleData.o
qsort.o
kernel_vsprintf.o
memcmp.o
Modified:
haiku/branches/developer/zooey/posix-locale/src/system/kernel/lib/Jamfile
===================================================================
--- haiku/branches/developer/zooey/posix-locale/src/system/kernel/lib/Jamfile
2010-07-13 20:03:46 UTC (rev 37500)
+++ haiku/branches/developer/zooey/posix-locale/src/system/kernel/lib/Jamfile
2010-07-13 21:47:49 UTC (rev 37501)
@@ -44,6 +44,7 @@
# locale
ctype.cpp
localeconv.cpp
+ LocaleData.cpp
# stdio (this subdir)
kernel_vsprintf.cpp
# stdlib
Modified:
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMessagesData.cpp
===================================================================
---
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMessagesData.cpp
2010-07-13 20:03:46 UTC (rev 37500)
+++
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMessagesData.cpp
2010-07-13 21:47:49 UTC (rev 37501)
@@ -7,6 +7,7 @@
#include "ICUMessagesData.h"
#include <langinfo.h>
+#include <string.h>
namespace BPrivate {
Modified:
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/LocaleData.cpp
===================================================================
---
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/LocaleData.cpp
2010-07-13 20:03:46 UTC (rev 37500)
+++
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/LocaleData.cpp
2010-07-13 21:47:49 UTC (rev 37501)
@@ -5,13 +5,16 @@
#include <ctype.h>
-#include <langinfo.h>
#include <limits.h>
#include <PosixCtype.h>
+#include <PosixLocaleConv.h>
+
+#ifndef _KERNEL_MODE
+#include <langinfo.h>
#include <PosixLanginfo.h>
-#include <PosixLocaleConv.h>
#include <PosixLCTimeInfo.h>
+#endif
/*
@@ -159,6 +162,8 @@
};
+#ifndef _KERNEL_MODE
+
const struct lc_time_t gPosixLCTimeInfo = {
{
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
@@ -256,7 +261,9 @@
gPosixLocaleConv.currency_symbol
};
+#endif // !_KERNEL_MODE
+
} // namespace BPrivate
Modified:
haiku/branches/developer/zooey/posix-locale/src/system/runtime_loader/Jamfile
===================================================================
---
haiku/branches/developer/zooey/posix-locale/src/system/runtime_loader/Jamfile
2010-07-13 20:03:46 UTC (rev 37500)
+++
haiku/branches/developer/zooey/posix-locale/src/system/runtime_loader/Jamfile
2010-07-13 21:47:49 UTC (rev 37501)
@@ -33,6 +33,7 @@
<src!system!libroot!posix>fcntl.o
<src!system!libroot!posix!locale>ctype.o
+ <src!system!libroot!posix!locale>LocaleData.o
<src!system!libroot!posix!string>memchr.o
<src!system!libroot!posix!string>memcmp.o
Modified:
haiku/branches/developer/zooey/posix-locale/src/tests/system/libroot/posix/locale_test.cpp
===================================================================
---
haiku/branches/developer/zooey/posix-locale/src/tests/system/libroot/posix/locale_test.cpp
2010-07-13 20:03:46 UTC (rev 37500)
+++
haiku/branches/developer/zooey/posix-locale/src/tests/system/libroot/posix/locale_test.cpp
2010-07-13 21:47:49 UTC (rev 37501)
@@ -8,6 +8,7 @@
#include <langinfo.h>
#include <locale.h>
#include <stdio.h>
+#include <string.h>
#include <time.h>
#include <wctype.h>
Other related posts:
- » [haiku-commits] r37501 - in haiku/branches/developer/zooey/posix-locale/src: system/boot system/kernel/lib system/libroot/posix/locale system/runtime_loader tests/system/libroot/posix - zooey
