diff --git a/ChangeLog b/ChangeLog index 0bc3c44c08..8bd84f26a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,37 @@ + 2015-06-03 10:39 mapopa + M src/jrd/isc_sync.cpp + M src/remote/inet.cpp +SIGURG is not used anywhere , cleanup comments + + 2015-06-03 08:30 mapopa + M configure.in +Misc + + 2015-06-03 08:22 mapopa + M src/common/classes/alloc.cpp + M src/common/classes/alloc.h +Libreoffice patch : C++11: new/delete replacement functions cannot be inline https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg79870.html + + 2015-06-03 08:11 mapopa + M src/common/classes/alloc.cpp + M src/common/cvt.cpp + M src/gpre/c_cxx.cpp + M src/gpre/exp.cpp + M src/gpre/gpre.cpp + M src/gpre/int_cxx.cpp + M src/gpre/pat.cpp + M src/jrd/perf.cpp +Apply Partial patch for C++11 compilation of the Firebird code in libreoffice http://cgit.freedesktop.org/libreoffice/core/commit/?id=9fe159ef7cb7cfe5c1c91a6fbf1aa02fe79fec69 + + 2015-06-03 08:01 mapopa + M configure.in +add cygwin target from libreoffice + + 2015-06-03 07:54 mapopa + M builds/posix/prefix.mingw + M configure.in +no-cygwin is deprecated + 2015-06-01 13:59 alexpeshkoff M src/remote/inet.cpp Added check for failed fork() system call diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index e594093ce0..1b868f69a6 100644 --- a/src/jrd/build_no.h +++ b/src/jrd/build_no.h @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:26879 + FORMAL BUILD NUMBER:26885 */ -#define PRODUCT_VER_STRING "2.5.5.26879" -#define FILE_VER_STRING "WI-V2.5.5.26879" -#define LICENSE_VER_STRING "WI-V2.5.5.26879" -#define FILE_VER_NUMBER 2, 5, 5, 26879 +#define PRODUCT_VER_STRING "2.5.5.26885" +#define FILE_VER_STRING "WI-V2.5.5.26885" +#define LICENSE_VER_STRING "WI-V2.5.5.26885" +#define FILE_VER_NUMBER 2, 5, 5, 26885 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "5" -#define FB_BUILD_NO "26879" +#define FB_BUILD_NO "26885" #define FB_BUILD_TYPE "V" #define FB_BUILD_SUFFIX "Firebird 2.5" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index f73db5979e..82e8d5e157 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=5 -BuildNum=26879 +BuildNum=26885 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds