errors compiling classFileParser.cpp on Mac OS X

[Stephen Bannasch]

>Building after an hg fpull and hg fupdate today fails while compiling

I think the problem is an error in how I was updating my hg clone due 
to my very limited knowledge of mercurial and forest.

The build worked fine with a fresh clone and after applying Pierre 
Queinnec patch for the iconv lib on MacOS X:

   http://mail.openjdk.java.net/pipermail/bsd-port-dev/2009-February/000503.html

In the older local hg clone I had done:

   $ hg fpull

And hg reported a problem that needed to be resolved with hg merge or 
a pull with -C. I didn't pay close attention and used -C.