| 123456789101112131415161718192021222324252627282930313233343536 |
- Index: configure
- --- configure.orig 2007-10-26 00:41:00 +0200
- +++ configure 2007-10-26 11:18:21 +0200
- @@ -12100,7 +12100,7 @@
- # automatically.
- PCRE_LIBS="`pcre-config --libs | \
- sed -e 's:-L */usr/lib/*::' -e 's:-R */usr/lib/*::' \
- - -e 's:-L */lib/*:: -e 's:-R */lib/*::'`"
- + -e 's:-L */lib/*::' -e 's:-R */lib/*::'`"
- found_libpcre=yes
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- Index: pcrewrap.cc
- --- pcrewrap.cc.orig 2007-10-26 00:40:22 +0200
- +++ pcrewrap.cc 2007-10-26 15:19:23 +0200
- @@ -15,7 +15,6 @@
- // This dirty trick is necessary to prevent the 'pcre' typedef defined by
- // pcre.h from colliding with namespace pcre.
- #define pcre pcre_t
- -#include "pcre_config.h"
- #include "pcre.h"
- #undef pcre
-
- Index: std_hooks.lua
- --- std_hooks.lua f6f5c8d503faca26fdc2e06a1a9285f8d4b3700f
- +++ std_hooks.lua 149fd794ce4f182372cde6b3f12c8877256a58b3
- @@ -765,7 +765,7 @@ function get_preferred_merge3_command (t
- -- If there wasn't any user-given merger, take the first that's available
- -- and wanted.
- for _,mkey in ipairs(default_order) do
- - c = trymerger(mkey) ; if c then return c,nil end
- + c = trymerger(mkey) ; if c then return c,mkey end
- end
- end
-
|
