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

* Merged weak-symbols branch.

Browse Source 
* Fixed trivial merge conflict in src/system/libroot/posix/locale/nl_langinfo.cpp
* Fixed gcc 2 compilation of src/system/glue/init_term_dyn.c.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39571 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-11-22 13:06:36 +00:00
parent 921e955104
commit 25dc253d6a
174 changed files with 1622 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/locale/Catalog.h
+8 -6
View File
@@ -93,24 +93,26 @@ private:
// Translation macros which may be used to shorten translation requests:
#undef B_TRANSLATE
#define B_TRANSLATE(string) \
be_locale_roster->GetCatalog()->GetString((string), B_TRANSLATE_CONTEXT)
BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_CONTEXT)
#undef B_TRANSLATE_WITH_CONTEXT
#define B_TRANSLATE_WITH_CONTEXT(string, context) \
be_locale_roster->GetCatalog()->GetString((string), (context))
BLocaleRoster::Default()->GetCatalog()->GetString((string), (context))
#undef B_TRANSLATE_COMMENT
#define B_TRANSLATE_COMMENT(string, comment) \
be_locale_roster->GetCatalog()->GetString((string), B_TRANSLATE_CONTEXT, \
(comment))
BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_CONTEXT, (comment))
#undef B_TRANSLATE_ALL
#define B_TRANSLATE_ALL(string, context, comment) \
be_locale_roster->GetCatalog()->GetString((string), (context), (comment))
BLocaleRoster::Default()->GetCatalog()->GetString((string), (context), \
(comment))
#undef B_TRANSLATE_ID
#define B_TRANSLATE_ID(id) \
be_locale_roster->GetCatalog()->GetString((id))
BLocaleRoster::Default()->GetCatalog()->GetString((id))
// Translation markers which can be used to mark static strings/IDs which
// are used as key for translation requests (at other places in the code):
headers/os/locale/Locale.h
+2 -4
View File
@@ -49,6 +49,8 @@ public:
BLocale(const BLocale& other);
~BLocale();
static const BLocale* Default();
BLocale& operator=(const BLocale& other);
status_t GetCollator(BCollator* collator) const;
@@ -155,10 +157,6 @@ private:
};
// global locale object
extern const BLocale* be_locale;
//--- collator short-hands inlines ---
// #pragma mark -
headers/os/locale/LocaleRoster.h
+2 -3
View File
@@ -30,6 +30,8 @@ public:
BLocaleRoster();
~BLocaleRoster();
static BLocaleRoster* Default();
status_t GetDefaultTimeZone(BTimeZone* timezone) const;
status_t GetLanguage(const char* languageCode,
@@ -76,7 +78,4 @@ private:
};
extern BLocaleRoster* be_locale_roster;
#endif // _LOCALE_ROSTER_H_
headers/posix/resolv.h
+1 -1
View File
@@ -406,7 +406,7 @@ const char * loc_ntoa(const u_char *, char *);
int dn_skipname(const u_char *, const u_char *);
void putlong(u_int32_t, u_char *);
void putshort(u_int16_t, u_char *);
#ifndef __ultrix__
#if !defined(__ultrix__) && !defined(__HAIKU__)
u_int16_t _getshort(const u_char *);
u_int32_t _getlong(const u_char *);
#endif
headers/private/libroot/locale/ICUCategoryData.h
+2
View File
@@ -14,6 +14,7 @@
namespace BPrivate {
namespace Libroot {
class ICUCategoryData {
@@ -47,6 +48,7 @@ private:
};
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/ICUCollateData.h
+2
View File
@@ -12,6 +12,7 @@
namespace BPrivate {
namespace Libroot {
class ICUCollateData : public ICUCategoryData {
@@ -37,6 +38,7 @@ private:
};
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/ICUCtypeData.h
+2
View File
@@ -11,6 +11,7 @@
namespace BPrivate {
namespace Libroot {
class ICUCtypeData : public ICUCategoryData {
@@ -49,6 +50,7 @@ private:
};
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/ICULocaleBackend.h
+2
View File
@@ -21,6 +21,7 @@
namespace BPrivate {
namespace Libroot {
class ICULocaleBackend : public LocaleBackend {
@@ -77,6 +78,7 @@ private:
};
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/ICULocaleconvData.h
+2
View File
@@ -12,6 +12,7 @@
namespace BPrivate {
namespace Libroot {
typedef DecimalFormatSymbols::ENumberFormatSymbol FormatSymbol;
@@ -27,6 +28,7 @@ protected:
};
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/ICUMessagesData.h
+2
View File
@@ -11,6 +11,7 @@
namespace BPrivate {
namespace Libroot {
class ICUMessagesData : public ICUCategoryData {
@@ -33,6 +34,7 @@ private:
};
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/ICUMonetaryData.h
+2
View File
@@ -13,6 +13,7 @@
namespace BPrivate {
namespace Libroot {
class ICUMonetaryData : public ICULocaleconvData {
@@ -63,6 +64,7 @@ private:
};
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/ICUNumericData.h
+2
View File
@@ -11,6 +11,7 @@
namespace BPrivate {
namespace Libroot {
class ICUNumericData : public ICULocaleconvData {
@@ -37,6 +38,7 @@ private:
};
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/ICUTimeConversion.h
+2
View File
@@ -15,6 +15,7 @@
namespace BPrivate {
namespace Libroot {
class ICUTimeConversion {
@@ -45,6 +46,7 @@ private:
};
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/ICUTimeData.h
+2
View File
@@ -15,6 +15,7 @@
namespace BPrivate {
namespace Libroot {
class ICUTimeData : public ICUCategoryData {
@@ -60,6 +61,7 @@ private:
};
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/LocaleBackend.h
+2
View File
@@ -18,6 +18,7 @@ struct locale_data; // glibc
namespace BPrivate {
namespace Libroot {
struct LocaleCtypeDataBridge {
@@ -144,6 +145,7 @@ public:
extern LocaleBackend* gLocaleBackend;
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/PosixCtype.h
+2
View File
@@ -7,6 +7,7 @@
namespace BPrivate {
namespace Libroot {
/*
@@ -22,6 +23,7 @@ extern const int gPosixToLowerMap[384];
extern const int gPosixToUpperMap[384];
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/PosixLanginfo.h
+2
View File
@@ -7,11 +7,13 @@
namespace BPrivate {
namespace Libroot {
extern const char* gPosixLanginfo[];
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/locale/PosixLocaleConv.h
+2
View File
@@ -10,11 +10,13 @@
namespace BPrivate {
namespace Libroot {
extern struct lconv gPosixLocaleConv;
} // namespace Libroot
} // namespace BPrivate
headers/private/libroot/time/PosixLCTimeInfo.h
+2
View File
@@ -10,11 +10,13 @@
namespace BPrivate {
namespace Libroot {
extern const struct lc_time_t gPosixLCTimeInfo;
} // namespace Libroot
} // namespace BPrivate
headers/private/locale/MutableLocaleRoster.h
+6 -6
View File
@@ -34,6 +34,8 @@ public:
MutableLocaleRoster();
~MutableLocaleRoster();
static MutableLocaleRoster* Default();
status_t SetDefaultFormattingConventions(
const BFormattingConventions& conventions);
status_t SetDefaultTimeZone(const BTimeZone& zone);
@@ -57,9 +59,6 @@ public:
};
extern MutableLocaleRoster* gMutableLocaleRoster;
typedef BCatalogAddOn* (*InstantiateCatalogFunc)(const char* name,
const char* language, uint32 fingerprint);
@@ -116,8 +115,12 @@ struct RosterData {
BResources fResources;
RosterData();
RosterData(const BLanguage& language,
const BFormattingConventions& conventions);
~RosterData();
static RosterData* Default();
void InitializeCatalogAddOns();
void CleanupCatalogAddOns();
status_t Refresh();
@@ -150,9 +153,6 @@ private:
};
extern RosterData gRosterData;
} // namespace BPrivate
headers/private/system/elf32.h
+42 -24
View File
@@ -228,30 +228,40 @@ struct Elf32_Dyn {
} d_un;
};
#define DT_NULL 0
#define DT_NEEDED 1
#define DT_PLTRELSZ 2
#define DT_PLTGOT 3
#define DT_HASH 4
#define DT_STRTAB 5
#define DT_SYMTAB 6
#define DT_RELA 7
#define DT_RELASZ 8
#define DT_RELAENT 9
#define DT_STRSZ 10
#define DT_SYMENT 11
#define DT_INIT 12
#define DT_FINI 13
#define DT_SONAME 14
#define DT_RPATH 15
#define DT_SYMBOLIC 16
#define DT_REL 17
#define DT_RELSZ 18
#define DT_RELENT 19
#define DT_PLTREL 20
#define DT_DEBUG 21
#define DT_TEXTREL 22
#define DT_JMPREL 23
#define DT_NULL 0
#define DT_NEEDED 1
#define DT_PLTRELSZ 2
#define DT_PLTGOT 3
#define DT_HASH 4
#define DT_STRTAB 5
#define DT_SYMTAB 6
#define DT_RELA 7
#define DT_RELASZ 8
#define DT_RELAENT 9
#define DT_STRSZ 10
#define DT_SYMENT 11
#define DT_INIT 12
#define DT_FINI 13
#define DT_SONAME 14
#define DT_RPATH 15
#define DT_SYMBOLIC 16
#define DT_REL 17
#define DT_RELSZ 18
#define DT_RELENT 19
#define DT_PLTREL 20
#define DT_DEBUG 21
#define DT_TEXTREL 22
#define DT_JMPREL 23
#define DT_BIND_NOW 24 /* no lazy binding */
#define DT_INIT_ARRAY 25 /* init function array */
#define DT_FINI_ARRAY 26 /* termination function array */
#define DT_INIT_ARRAYSZ 27 /* init function array size */
#define DT_FINI_ARRAYSZ 28 /* termination function array size */
#define DT_RUNPATH 29 /* library search path (supersedes DT_RPATH) */
#define DT_FLAGS 30 /* flags (see below) */
#define DT_ENCODING 32
#define DT_PREINIT_ARRAY 32 /* preinitialization array */
#define DT_PREINIT_ARRAYSZ 33 /* preinitialization array size */
#define DT_VERSYM 0x6ffffff0 /* symbol version table */
#define DT_VERDEF 0x6ffffffc /* version definition table */
@@ -263,6 +273,14 @@ struct Elf32_Dyn {
#define DT_HIPROC 0x7fffffff
/* DT_FLAGS values */
#define DF_ORIGIN 0x01
#define DF_SYMBOLIC 0x02
#define DF_TEXTREL 0x04
#define DF_BIND_NOW 0x08
#define DF_STATIC_TLS 0x10
/* version definition section */
struct Elf32_Verdef {