make fails if --enable-debug is used

[oBFusCATed]

Here is the failure:

Code Select Expand


de -I../../src/sdk/wxscintilla/include -I../../src/sdk/wxpropgrid/include -I../../src/include/tinyxml -I../../src/include/scripting/include -I../../src/include/scripting/bindings -I../../src/include/scripting/sqplus -I../../src/include/mozilla_chardet -I../../src/include/mozilla_chardet/mfbt -I../../src/include/mozilla_chardet/nsprpub/pr/include -I../../src/include/mozilla_chardet/xpcom -I../../src/include/mozilla_chardet/xpcom/base -I../../src/include/mozilla_chardet/xpcom/glue -ansi -DTIXML_USE_STL -g -DDEBUG -DCB_AUTOCONF -march=core2 -O2 -fweb -frename-registers -pipe -fPIC -DPIC -fexceptions -c mozilla_chardet/src/nsBig5Prober.cpp  -fPIC -DPIC -o .libs/nsBig5Prober.o
In file included from mozilla_chardet/src/nsBig5Prober.cpp:7:0:
../../src/include/mozilla_chardet/xpcom/glue/nsDebug.h:22:19: fatal error: prprf.h: No such file or directory
compilation terminated.
make[3]: *** [nsBig5Prober.lo] Error 1
make[3]: *** Waiting for unfinished jobs....


Should I commit a fix like this:

Code Select Expand


diff --git a/src/include/mozilla_chardet/xpcom/glue/nsDebug.h b/src/include/mozilla_chardet/xpcom/glue/nsDebug.h
index 0b2c1cf..1c60285 100644
--- a/src/include/mozilla_chardet/xpcom/glue/nsDebug.h
+++ b/src/include/mozilla_chardet/xpcom/glue/nsDebug.h
@@ -18,11 +18,11 @@
#include "mozilla/Assertions.h"
#include "mozilla/Likely.h"

-#ifdef DEBUG
+#ifdef BLABLA_DEBUG
#include "prprf.h"
#endif

-#ifdef DEBUG
+#ifdef BLABLA_DEBUG

/**
  * Abort the execution of the program if the expression evaluates to


[MortenMacFly]

Should I commit a fix like this:

Code Select Expand


...


I would first check the Mozilla code base if they did fix it in a certain way and (if so) sync the sources with their repo.

If there are no updates, commit, but please embed changes of 3rd party libs into C::B comments so we can keep track of them.

[oBFusCATed]

I would first check the Mozilla code base if they did fix it in a certain way and (if so) sync the sources with their repo.

I doubt they've "fixed" it, because I think we have missing files, probably something that is deep in the include chains.
I'll wrap the changes in C::B tags, this was just a demonstration patch.

[MortenMacFly]

I'll wrap the changes in C::B tags, this was just a demonstration patch.

Wait a sec... for MOzilla we have a different approach I guess: the original files are copied to "filename.ext.old" and committed for reference here. (I think I did it did to the massive changes we did in several files.) So if there is already and ".old" file, you can ignore the wrapping comments. :-)