| Index: trunk/extensions/wikidiff2/config.m4 |
| — | — | @@ -36,8 +36,6 @@ |
| 37 | 37 | |
| 38 | 38 | PHP_SUBST(WIKIDIFF2_SHARED_LIBADD) |
| 39 | 39 | AC_DEFINE(HAVE_WIKIDIFF2, 1, [ ]) |
| 40 | | - export CXXFLAGS_SAVE=$CXXFLAGS |
| 41 | 40 | export CXXFLAGS="-Wno-write-strings $CXXFLAGS" |
| 42 | 41 | PHP_NEW_EXTENSION(wikidiff2, php_wikidiff2.cpp wikidiff2.cpp, $ext_shared) |
| 43 | | - export CXXFLAGS="$CXXFLAGS" |
| 44 | 42 | fi |
| Index: trunk/extensions/wikidiff2/php_wikidiff2.cpp |
| — | — | @@ -12,7 +12,7 @@ |
| 13 | 13 | |
| 14 | 14 | static int le_wikidiff2; |
| 15 | 15 | |
| 16 | | -const zend_function_entry wikidiff2_functions[] = { |
| | 16 | +zend_function_entry wikidiff2_functions[] = { |
| 17 | 17 | PHP_FE(wikidiff2_do_diff, NULL) |
| 18 | 18 | {NULL, NULL, NULL} |
| 19 | 19 | }; |
| — | — | @@ -91,7 +91,7 @@ |
| 92 | 92 | Wikidiff2::String text1String(text1, text1_len); |
| 93 | 93 | Wikidiff2::String text2String(text2, text2_len); |
| 94 | 94 | const Wikidiff2::String & ret = wikidiff2.execute(text1String, text2String, numContextLines); |
| 95 | | - RETURN_STRINGL(ret.data(), ret.size(), 1); |
| | 95 | + RETURN_STRINGL( const_cast<char*>(ret.data()), ret.size(), 1); |
| 96 | 96 | } catch (std::bad_alloc &e) { |
| 97 | 97 | zend_error(E_WARNING, "Out of memory in wikidiff2_do_diff()."); |
| 98 | 98 | } catch (...) { |
| Index: trunk/extensions/wikidiff2/README |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | * (bug 25697) Add   to empty context lines |
| 29 | 29 | |
| 30 | 30 | 2010-09-30 |
| 31 | | -* Automaticly use CXXFLAGS=-Wno-write-strings |
| | 31 | +* Automatically use CXXFLAGS=-Wno-write-strings |
| 32 | 32 | |
| 33 | 33 | 2010-06-14 |
| 34 | 34 | * Converted the extension from swig to PHP native. |