Change DEPRECATED macro to ATTR_DEPRECATED as this conflicts with some

java constants.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@13611 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index 1632b68e129f0aa1caf82a3d9d62334701ee0b14..55abdfae46b5a3e810de09df9383f231497ec15f 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -294,7 +294,7 @@ CPPFLAGS += -D_GNU_SOURCE
 CPPFLAGS += -D__STDC_LIMIT_MACROS
 
 ### FIXME: this is GCC specific
-CPPFLAGS += -DDEPRECATED='__attribute__ ((deprecated))'
+CPPFLAGS += -DATTR_DEPRECATED='__attribute__ ((deprecated))'
 
 CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused
 CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions