am db815b79: Merge "Fix a dangerous macro."

* commit 'db815b79a788e19a7c61d89941bec5851487112f':
  Fix a dangerous macro.
This commit is contained in:
Yusuke Nojima 2011-09-20 14:14:23 -07:00 committed by Android Git Automerger
commit 5554192dd0

View file

@ -131,7 +131,7 @@ static void dumpWord(const unsigned short* word, const int length) {
#endif // FLAG_DBG
#ifndef U_SHORT_MAX
#define U_SHORT_MAX 1 << 16
#define U_SHORT_MAX 65535 // ((1 << 16) - 1)
#endif
#ifndef S_INT_MAX
#define S_INT_MAX 2147483647 // ((1 << 31) - 1)