diff options
| author | Robert Figura | 2011-06-19 23:35:35 +0200 |
|---|---|---|
| committer | Robert Figura | 2011-06-19 23:35:35 +0200 |
| commit | 319dc920a62c8d03ab856a65c17b45321e3ca385 (patch) | |
| tree | e62ebd4ab97f7c62b4abdf87e4fa916f06335e7e /java | |
| parent | a4246c561a37aeadd5104fa504355b5ce919d23a (diff) | |
antlr: PRE_BUILD: converted C++ fix to patch, extended fix
Diffstat (limited to 'java')
| -rw-r--r-- | java/antlr/HISTORY | 3 | ||||
| -rwxr-xr-x | java/antlr/PRE_BUILD | 8 | ||||
| -rw-r--r-- | java/antlr/patch-g++-4.4.3 | 17 |
3 files changed, 22 insertions, 6 deletions
diff --git a/java/antlr/HISTORY b/java/antlr/HISTORY index ee23be1da2..df6bf48380 100644 --- a/java/antlr/HISTORY +++ b/java/antlr/HISTORY @@ -1,3 +1,6 @@ +2011-06-19 Robert Figura <template@sourcemage.org> + * PRE_BUILD: converted C++ fix to patch, extended fix + 2008-04-25 Pol Vinogradov <vin.public@gmail.com> * PRE_BUILD: added to fix compiling of C++ library diff --git a/java/antlr/PRE_BUILD b/java/antlr/PRE_BUILD index 5760871cc1..0e349f32ac 100755 --- a/java/antlr/PRE_BUILD +++ b/java/antlr/PRE_BUILD @@ -1,7 +1,3 @@ default_pre_build && -cd ${SOURCE_DIRECTORY} && - -if is_depends_enabled $SPELL g++; then - sedit "s:#include <antlr/TokenStream.hpp>:#include <strings.h>\n\n#include <antlr/TokenStream.hpp>:" \ -lib/cpp/antlr/CharScanner.hpp -fi +cd ${SOURCE_DIRECTORY} && +patch -p0 < ${SPELL_DIRECTORY}/patch-g++-4.4.3 diff --git a/java/antlr/patch-g++-4.4.3 b/java/antlr/patch-g++-4.4.3 new file mode 100644 index 0000000000..c9c4101f1f --- /dev/null +++ b/java/antlr/patch-g++-4.4.3 @@ -0,0 +1,17 @@ +--- lib/cpp/antlr/CharScanner.hpp.bak 2006-11-01 22:37:17.000000000 +0100 ++++ lib/cpp/antlr/CharScanner.hpp 2011-06-19 23:08:59.000000000 +0200 +@@ -18,11 +18,9 @@ + #include <cctype> + #endif + +-#if ( _MSC_VER == 1200 ) +-// VC6 seems to need this +-// note that this is not a standard C++ include file. +-# include <stdio.h> +-#endif ++#include <cstdio> ++ ++#include <strings.h> + + #include <antlr/TokenStream.hpp> + #include <antlr/RecognitionException.hpp> |