39374 - nightly build fails with workshop 6 on solaris

Status: RESOLVED FIXED

(Core :: XPCOM, defect, P3)

Description

[Neelakanth Nadgir]

The nightly mozilla builds has been failing over last 3 days when               
compiling with workshop6.  Gcc builds do not
fail.                                                     
                                                                                
the errors are                                                                  
======                                                                          
 nsRegistry.cpp                                                                 
"nsRegistry.cpp", line 1417: Error: Cannot use const char* to initialize        
char*.                                                                          
"nsRegistry.cpp", line 1418: Error: Cannot use const char* to initialize        
char*.                                                                          
2 Error(s) detected.                                                            
======                 
the guilty lines are                                                            
====                                                                            
char* c1 = strchr(sEscapeKeyHex, *(b++));                                       
char* c2 = strchr(sEscapeKeyHex, *(b++));                                       
                                                                                
                                                                                
prepending "const" to the above two lines solves the problem.
Here is a diff that solves the problem.


neel@neel: ...nightly/CC/mozilla> diff -c xpcom/components/nsRegistry.cpp.orig
xpcom/components/nsRegistry.cpp
*** xpcom/components/nsRegistry.cpp.orig        Mon May 15 20:06:59 2000
--- xpcom/components/nsRegistry.cpp     Mon May 15 20:07:29 2000
***************
*** 1414,1421 ****
          {
              if (e - b >= 2)
              {
!                 char* c1 = strchr(sEscapeKeyHex, *(b++));
!                 char* c2 = strchr(sEscapeKeyHex, *(b++));
                  if (c1 != nsnull
                      && c2 != nsnull)
                  {
--- 1414,1421 ----
          {
              if (e - b >= 2)
              {
!                 const char* c1 = strchr(sEscapeKeyHex, *(b++));
!                 const char* c2 = strchr(sEscapeKeyHex, *(b++));
                  if (c1 != nsnull
                      && c2 != nsnull)
                  {

Comment 1

[Chris Waterson]

Looks like someone checked these in already...tor maybe?