duplicated #defines in wxscintilla.h

[ollydbg]

Hi, I just see in the master(svn head) the file \src\sdk\wxscintilla\include\wx\wxscintilla.h

There are code snippet around line 227

Code Select Expand


#define wxSCI_INDIC_POINTCHARACTER 19
/* C::B begin */
#define wxSCI_INDIC_HIGHLIGHT 31 // please change also in Scintilla.h !!
/* C::B end */
#define wxSCI_INDIC_IME 32
#define wxSCI_INDIC_IME_MAX 35
#define wxSCI_INDIC_MAX 35
/* C::B begin INDIC_HIGHLIGHT */
#define wxSCI_INDIC_HIGHLIGHT 31 // please change also in wxscintilla.h !!
/* C::B end */

So, you see there are two "#define wxSCI_INDIC_HIGHLIGHT 31", any ideas? It looks like when I build C::B, I can't see the build errors.

[oBFusCATed]

These are only warnings... Wrong merge will fix...