530361 - Replace PR_MIN/PR_MAX with NS_MIN/NS_MAX in /intl

Status: RESOLVED FIXED

Description

[Jae-Seong Lee-Russo]

User-Agent:       Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.3a1pre) Gecko/20091120 Minefield/3.7a1pre (.NET CLR 3.5.30729)
Build Identifier: 

Please see Bug #512106.

Reproducible: Always

Comment 1

[Jae-Seong Lee-Russo]

Created attachment 413871 [details] [diff] [review]
Search&Replace, 0

Comment 2

[Phil Ringnalda (:philor)]

From an OS X build:
nsUCSupport.cpp
/Users/philor/mc/mozilla/intl/uconv/util/nsUCSupport.cpp: In member function ‘void nsBufferDecoderSupport::FillBuffer(const char**, PRInt32)’:
/Users/philor/mc/mozilla/intl/uconv/util/nsUCSupport.cpp:110: error: ‘NS_MIN’ was not declared in this scope

Comment 3

[Jae-Seong Lee-Russo]

Created attachment 417360 [details] [diff] [review]
Add #include

I have only Windows XP, so I could not test this on other platforms.  I included "nsAlgorithm.h" in nsUCSupport.cpp.  Will this fix the build error on OS X?

Comment 4

[Phil Ringnalda (:philor)]

No, according to the tryserver, that breaks all three platforms -

nsUnicodeToUTF8.cpp
/builds/slave/sendchange-macosx-hg/build/intl/uconv/src/nsUTF8ToUnicode.cpp: In member function 'virtual nsresult nsUTF8ToUnicode::Convert(const char*, PRInt32*, PRUnichar*, PRInt32*)':
/builds/slave/sendchange-macosx-hg/build/intl/uconv/src/nsUTF8ToUnicode.cpp:335: error: 'NS_MIN' was not declared in this scope

nsUTF8ToUnicode.cpp
/builds/slave/sendchange-linux-hg/build/intl/uconv/src/nsUTF8ToUnicode.cpp: In member function ‘virtual nsresult nsUTF8ToUnicode::Convert(const char*, PRInt32*, PRUnichar*, PRInt32*)’:
/builds/slave/sendchange-linux-hg/build/intl/uconv/src/nsUTF8ToUnicode.cpp:335: error: ‘NS_MIN’ was not declared in this scope

nsUTF8ToUnicode.cpp
e:/builds/slave/win32-hg/build/intl/uconv/src/nsUTF8ToUnicode.cpp(335) : error C3861: 'NS_MIN': identifier not found

Comment 5

[Jae-Seong Lee-Russo]

I updated my tree, did 'hg update -C tip' and applied the 2nd patch (Add #include); the build was successful on my computer (Windows XP), the tryserver says the otherwise, so I am not sure how to test the patches for bugs including this and others that fail on OS X.

I think adding #include "nsAlgorithm.h" to files that fail will solve the problem, but is it a good solution?

Comment 6

[Ed Morley (UK bank holiday, away until 30th May) [:emorley]]

Fixed by bug 661584.