[haiku-commits] r39372 - in haiku/branches/developer/bonefish/weak-symbols: headers/private/libroot/locale headers/private/libroot/time src/system/libroot/add-ons/icu src/system/libroot/posix/locale src/system/libroot/posix/string ...
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 9 Nov 2010 14:39:04 +0100 (CET)
Author: bonefish
Date: 2010-11-09 14:39:04 +0100 (Tue, 09 Nov 2010)
New Revision: 39372
Changeset: http://dev.haiku-os.org/changeset/39372
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCategoryData.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCollateData.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCtypeData.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICULocaleBackend.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICULocaleconvData.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUMessagesData.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUMonetaryData.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUNumericData.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUTimeConversion.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUTimeData.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/LocaleBackend.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixCtype.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixLanginfo.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixLocaleConv.h
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/time/PosixLCTimeInfo.h
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCategoryData.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCollateData.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCtypeData.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICULocaleconvData.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUMessagesData.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUNumericData.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUTimeData.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleBackend.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleData.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleDataBridge.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/localeconv.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/nl_langinfo.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/setlocale.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/wctype.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/string/strcoll.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/string/strxfrm.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/asctime.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/localtime.cpp
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/timelocal.cpp
Log:
Moved libroot's internal locale related stuff into sub-namespace
BPrivate::Libroot. This solves clashes with identically named symbols in
libbe/liblocale (LocaleBackend and friends) when building without -Bsymbolic.
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCategoryData.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCategoryData.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCategoryData.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -14,6 +14,7 @@
namespace BPrivate {
+namespace Libroot {
class ICUCategoryData {
@@ -47,6 +48,7 @@
};
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCollateData.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCollateData.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCollateData.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -12,6 +12,7 @@
namespace BPrivate {
+namespace Libroot {
class ICUCollateData : public ICUCategoryData {
@@ -37,6 +38,7 @@
};
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCtypeData.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCtypeData.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUCtypeData.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -11,6 +11,7 @@
namespace BPrivate {
+namespace Libroot {
class ICUCtypeData : public ICUCategoryData {
@@ -49,6 +50,7 @@
};
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICULocaleBackend.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICULocaleBackend.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICULocaleBackend.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -21,6 +21,7 @@
namespace BPrivate {
+namespace Libroot {
class ICULocaleBackend : public LocaleBackend {
@@ -77,6 +78,7 @@
};
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICULocaleconvData.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICULocaleconvData.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICULocaleconvData.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -12,6 +12,7 @@
namespace BPrivate {
+namespace Libroot {
typedef DecimalFormatSymbols::ENumberFormatSymbol FormatSymbol;
@@ -27,6 +28,7 @@
};
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUMessagesData.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUMessagesData.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUMessagesData.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -11,6 +11,7 @@
namespace BPrivate {
+namespace Libroot {
class ICUMessagesData : public ICUCategoryData {
@@ -33,6 +34,7 @@
};
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUMonetaryData.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUMonetaryData.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUMonetaryData.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -13,6 +13,7 @@
namespace BPrivate {
+namespace Libroot {
class ICUMonetaryData : public ICULocaleconvData {
@@ -63,6 +64,7 @@
};
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUNumericData.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUNumericData.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUNumericData.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -11,6 +11,7 @@
namespace BPrivate {
+namespace Libroot {
class ICUNumericData : public ICULocaleconvData {
@@ -37,6 +38,7 @@
};
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUTimeConversion.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUTimeConversion.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUTimeConversion.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -15,6 +15,7 @@
namespace BPrivate {
+namespace Libroot {
class ICUTimeConversion {
@@ -45,6 +46,7 @@
};
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUTimeData.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUTimeData.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/ICUTimeData.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -15,6 +15,7 @@
namespace BPrivate {
+namespace Libroot {
class ICUTimeData : public ICUCategoryData {
@@ -60,6 +61,7 @@
};
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/LocaleBackend.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/LocaleBackend.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/LocaleBackend.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -18,6 +18,7 @@
namespace BPrivate {
+namespace Libroot {
struct LocaleCtypeDataBridge {
@@ -143,6 +144,7 @@
extern LocaleBackend* gLocaleBackend;
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixCtype.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixCtype.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixCtype.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -7,6 +7,7 @@
namespace BPrivate {
+namespace Libroot {
/*
@@ -22,6 +23,7 @@
extern const int gPosixToUpperMap[384];
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixLanginfo.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixLanginfo.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixLanginfo.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -7,11 +7,13 @@
namespace BPrivate {
+namespace Libroot {
extern const char* gPosixLanginfo[];
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixLocaleConv.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixLocaleConv.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/locale/PosixLocaleConv.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -10,11 +10,13 @@
namespace BPrivate {
+namespace Libroot {
extern struct lconv gPosixLocaleConv;
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/time/PosixLCTimeInfo.h
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/time/PosixLCTimeInfo.h
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/headers/private/libroot/time/PosixLCTimeInfo.h
2010-11-09 13:39:04 UTC (rev 39372)
@@ -10,11 +10,13 @@
namespace BPrivate {
+namespace Libroot {
extern const struct lc_time_t gPosixLCTimeInfo;
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCategoryData.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCategoryData.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCategoryData.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -12,6 +12,7 @@
namespace BPrivate {
+namespace Libroot {
ICUCategoryData::ICUCategoryData()
@@ -130,4 +131,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCollateData.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCollateData.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCollateData.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -12,6 +12,7 @@
namespace BPrivate {
+namespace Libroot {
ICUCollateData::ICUCollateData()
@@ -173,4 +174,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCtypeData.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCtypeData.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUCtypeData.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -13,6 +13,7 @@
namespace BPrivate {
+namespace Libroot {
ICUCtypeData::ICUCtypeData()
@@ -192,4 +193,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -16,6 +16,7 @@
namespace BPrivate {
+namespace Libroot {
extern "C" LocaleBackend*
@@ -370,4 +371,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICULocaleconvData.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICULocaleconvData.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICULocaleconvData.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -10,6 +10,7 @@
namespace BPrivate {
+namespace Libroot {
status_t
@@ -29,4 +30,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUMessagesData.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUMessagesData.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUMessagesData.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -11,6 +11,7 @@
namespace BPrivate {
+namespace Libroot {
void
@@ -57,4 +58,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -12,6 +12,7 @@
namespace BPrivate {
+namespace Libroot {
ICUMonetaryData::ICUMonetaryData(struct lconv& localeConv)
@@ -319,4 +320,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUNumericData.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUNumericData.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUNumericData.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -12,6 +12,7 @@
namespace BPrivate {
+namespace Libroot {
ICUNumericData::ICUNumericData(struct lconv& localeConv)
@@ -123,4 +124,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -15,6 +15,7 @@
namespace BPrivate {
+namespace Libroot {
ICUTimeConversion::ICUTimeConversion(const ICUTimeData& timeData)
@@ -185,4 +186,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUTimeData.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUTimeData.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/add-ons/icu/ICUTimeData.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -17,6 +17,7 @@
namespace BPrivate {
+namespace Libroot {
ICUTimeData::ICUTimeData(struct lc_time_t& lcTimeInfo)
@@ -413,4 +414,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleBackend.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleBackend.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleBackend.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -12,6 +12,7 @@
namespace BPrivate {
+namespace Libroot {
LocaleBackend* gLocaleBackend = NULL;
@@ -52,7 +53,7 @@
LocaleBackend::LoadBackend()
{
if (gLocaleBackend == NULL) {
- pthread_once(&sBackendInitOnce, &BPrivate::LoadBackend);
+ pthread_once(&sBackendInitOnce,
&BPrivate::Libroot::LoadBackend);
if (gLocaleBackend != NULL)
gLocaleBackend->Initialize(&sLocaleDataBridge);
}
@@ -61,4 +62,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleData.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleData.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleData.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -25,6 +25,7 @@
namespace BPrivate {
+namespace Libroot {
/*
@@ -323,9 +324,10 @@
#endif // !_KERNEL_MODE
+} // namespace Libroot
} // namespace BPrivate
-const unsigned short* __ctype_b =
&BPrivate::gPosixClassInfo[128];
-const int* __ctype_tolower =
&BPrivate::gPosixToLowerMap[128];
-const int* __ctype_toupper =
&BPrivate::gPosixToUpperMap[128];
+const unsigned short* __ctype_b = &BPrivate::Libroot::gPosixClassInfo[128];
+const int* __ctype_tolower = &BPrivate::Libroot::gPosixToLowerMap[128];
+const int* __ctype_toupper = &BPrivate::Libroot::gPosixToUpperMap[128];
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleDataBridge.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleDataBridge.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/LocaleDataBridge.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -21,6 +21,7 @@
namespace BPrivate {
+namespace Libroot {
LocaleCtypeDataBridge::LocaleCtypeDataBridge()
@@ -89,4 +90,5 @@
}
+} // namespace Libroot
} // namespace BPrivate
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/localeconv.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/localeconv.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/localeconv.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -12,7 +12,7 @@
#ifndef _KERNEL_MODE
#include "LocaleBackend.h"
-using BPrivate::gLocaleBackend;
+using BPrivate::Libroot::gLocaleBackend;
#endif
@@ -24,5 +24,5 @@
return const_cast<lconv*>(gLocaleBackend->LocaleConv());
#endif
- return &BPrivate::gPosixLocaleConv;
+ return &BPrivate::Libroot::gPosixLocaleConv;
}
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/nl_langinfo.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/nl_langinfo.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/nl_langinfo.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -11,15 +11,17 @@
#include <PosixLanginfo.h>
-using BPrivate::gLocaleBackend;
-using BPrivate::gPosixLanginfo;
+using BPrivate::Libroot::gLocaleBackend;
+using BPrivate::Libroot::gPosixLanginfo;
extern "C" char*
nl_langinfo(nl_item item)
{
- if (item < 0 || item >= _NL_LANGINFO_LAST)
- return "";
+ if (item < 0 || item >= _NL_LANGINFO_LAST) {
+ static char sEmptyString = '\0';
+ return &sEmptyString;
+ }
if (gLocaleBackend != NULL)
return const_cast<char*>(gLocaleBackend->GetLanginfo(item));
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/setlocale.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/setlocale.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/setlocale.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -13,8 +13,8 @@
#include "LocaleBackend.h"
-using BPrivate::gLocaleBackend;
-using BPrivate::LocaleBackend;
+using BPrivate::Libroot::gLocaleBackend;
+using BPrivate::Libroot::LocaleBackend;
static status_t
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/wctype.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/wctype.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/locale/wctype.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -11,7 +11,7 @@
#include "LocaleBackend.h"
-using BPrivate::gLocaleBackend;
+using BPrivate::Libroot::gLocaleBackend;
/*
* In many of the following functions, we make use of the fact that with
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/string/strcoll.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/string/strcoll.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/string/strcoll.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -10,7 +10,7 @@
#include "LocaleBackend.h"
-using BPrivate::gLocaleBackend;
+using BPrivate::Libroot::gLocaleBackend;
extern "C" int
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/string/strxfrm.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/string/strxfrm.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/string/strxfrm.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -10,7 +10,7 @@
#include "LocaleBackend.h"
-using BPrivate::gLocaleBackend;
+using BPrivate::Libroot::gLocaleBackend;
extern "C" size_t
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/asctime.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/asctime.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/asctime.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -11,7 +11,7 @@
#include "PosixLCTimeInfo.h"
-using BPrivate::gPosixLCTimeInfo;
+using BPrivate::Libroot::gPosixLCTimeInfo;
static char*
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/localtime.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/localtime.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/localtime.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -16,8 +16,8 @@
#include "LocaleBackend.h"
-using BPrivate::gLocaleBackend;
-using BPrivate::LocaleBackend;
+using BPrivate::Libroot::gLocaleBackend;
+using BPrivate::Libroot::LocaleBackend;
static char sStandardTZName[64] = { "???" };
Modified:
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/timelocal.cpp
===================================================================
---
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/timelocal.cpp
2010-11-09 11:07:26 UTC (rev 39371)
+++
haiku/branches/developer/bonefish/weak-symbols/src/system/libroot/posix/time/timelocal.cpp
2010-11-09 13:39:04 UTC (rev 39372)
@@ -12,7 +12,7 @@
#include "PosixLCTimeInfo.h"
-using BPrivate::gLocaleBackend;
+using BPrivate::Libroot::gLocaleBackend;
extern "C" const lc_time_t*
@@ -21,5 +21,5 @@
if (gLocaleBackend)
return gLocaleBackend->LCTimeInfo();
- return &BPrivate::gPosixLCTimeInfo;
+ return &BPrivate::Libroot::gPosixLCTimeInfo;
}
Other related posts:
- » [haiku-commits] r39372 - in haiku/branches/developer/bonefish/weak-symbols: headers/private/libroot/locale headers/private/libroot/time src/system/libroot/add-ons/icu src/system/libroot/posix/locale src/system/libroot/posix/string ... - ingo_weinhold
