wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 659825 - Rename NS_DEPRECATED to MOZ_DEPRECATED to avoid conflict with Mac 10.7 SDK. r=jcranmer sr=bsmedberg

Browse Source
This commit is contained in:
Jesse Ruderman 2011-06-08 09:34:02 +02:00
parent bafc082ea2
commit a3638a85b4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xpcom/base/nscore.h
View File

@ -258,11 +258,11 @@
* Deprecated declarations. * Deprecated declarations.
*/ */
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
# define NS_DEPRECATED __attribute__((deprecated)) # define MOZ_DEPRECATED __attribute__((deprecated))
#elif defined(_MSC_VER) && (_MSC_VER >= 1300) #elif defined(_MSC_VER) && (_MSC_VER >= 1300)
# define NS_DEPRECATED __declspec(deprecated) # define MOZ_DEPRECATED __declspec(deprecated)
#else #else
# define NS_DEPRECATED # define MOZ_DEPRECATED
#endif #endif
/** /**

2
xpcom/idl-parser/header.py
View File

@ -345,7 +345,7 @@ def write_interface(iface, fd):
if iface.attributes.scriptable: if iface.attributes.scriptable:
fd.write("NS_SCRIPTABLE ") fd.write("NS_SCRIPTABLE ")
if iface.attributes.deprecated: if iface.attributes.deprecated:
fd.write("NS_DEPRECATED ") fd.write("MOZ_DEPRECATED ")
fd.write(iface.name) fd.write(iface.name)
if iface.base: if iface.base:
fd.write(" : public %s" % iface.base) fd.write(" : public %s" % iface.base)

6
xpcom/typelib/xpidl/xpidl_header.c
View File

@ -245,7 +245,7 @@ interface(TreeState *state)
"class %s%s%s%s", "class %s%s%s%s",
(keepvtable ? "" : "NS_NO_VTABLE "), (keepvtable ? "" : "NS_NO_VTABLE "),
(scriptable ? "NS_SCRIPTABLE " : ""), (scriptable ? "NS_SCRIPTABLE " : ""),
(deprecated ? "NS_DEPRECATED " : ""), (deprecated ? "MOZ_DEPRECATED " : ""),
className); className);
if ((iter = IDL_INTERFACE(iface).inheritance_spec)) { if ((iter = IDL_INTERFACE(iface).inheritance_spec)) {
@ -792,7 +792,7 @@ write_attr_accessor(IDL_tree attr_tree, FILE * outfile,
if (mode == AS_DECL) { if (mode == AS_DECL) {
if (IDL_tree_property_get(ident, "deprecated")) if (IDL_tree_property_get(ident, "deprecated"))
fputs("NS_DEPRECATED ", outfile); fputs("MOZ_DEPRECATED ", outfile);
if (is_method_scriptable(attr_tree, ident)) if (is_method_scriptable(attr_tree, ident))
fputs("NS_SCRIPTABLE ", outfile); fputs("NS_SCRIPTABLE ", outfile);
@ -1046,7 +1046,7 @@ write_method_signature(IDL_tree method_tree, FILE *outfile, int mode,
if (mode == AS_DECL) { if (mode == AS_DECL) {
if (IDL_tree_property_get(op->ident, "deprecated")) if (IDL_tree_property_get(op->ident, "deprecated"))
fputs("NS_DEPRECATED ", outfile); fputs("MOZ_DEPRECATED ", outfile);
if (is_method_scriptable(method_tree, op->ident)) if (is_method_scriptable(method_tree, op->ident))
fputs("NS_SCRIPTABLE ", outfile); fputs("NS_SCRIPTABLE ", outfile);