MFC r284743:

Rename __weak to __weak_symbol to avoid language conflict with objective-C.

PR:		200972 (exp-run)
Suggested by:	theraven@
This commit is contained in:
hselasky 2015-06-26 21:35:36 +00:00
parent 5a956cd60a
commit 45502dd8d1
2 changed files with 4 additions and 4 deletions

View File

@ -213,9 +213,9 @@
#define __packed
#define __aligned(x)
#define __section(x)
#define __weak
#define __weak_symbol
#else
#define __weak __attribute__((__weak__))
#define __weak_symbol __attribute__((__weak__))
#if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER)
#define __dead2
#define __pure2

View File

@ -69,8 +69,8 @@
* Initialize before referring to a given linker set.
*/
#define SET_DECLARE(set, ptype) \
extern ptype __weak *__CONCAT(__start_set_,set); \
extern ptype __weak *__CONCAT(__stop_set_,set)
extern ptype __weak_symbol *__CONCAT(__start_set_,set); \
extern ptype __weak_symbol *__CONCAT(__stop_set_,set)
#define SET_BEGIN(set) \
(&__CONCAT(__start_set_,set))