[Firebird-checkins] SF.net SVN: firebird:[61838] firebird/branches/B2_5_Release

[<fir...@us...>]

Revision: 61838
          http://sourceforge.net/p/firebird/code/61838
Author:   firebirds
Date:     2015-06-17 00:14:23 +0000 (Wed, 17 Jun 2015)
Log Message:
-----------
nightly update

Modified Paths:
--------------
    firebird/branches/B2_5_Release/ChangeLog
    firebird/branches/B2_5_Release/src/jrd/build_no.h
    firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh

Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog	2015-06-17 00:10:15 UTC (rev 61837)
+++ firebird/branches/B2_5_Release/ChangeLog	2015-06-17 00:14:23 UTC (rev 61838)
@@ -1,3 +1,11 @@
+ 2015-06-16 11:36  paulbeach 
+   M src/jrd/common.h
+This undef should not be necessary from C/aCC+ A.06.26+
+
+ 2015-06-16 11:24  paulbeach 
+   M builds/posix/darwin.defaults
+Fix for gcc 4.1 problem is no longer needed. gcc 4.2 from MacOSX 10.8 
+
  2015-06-15 15:11  mapopa 
    M builds/posix/darwin.defaults
 Apply libo patch for El Capitan https://github.com/LibreOffice/core/commit/a799d7c9a66464f33bd8ee42d535e29a976d64ae

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-06-17 00:10:15 UTC (rev 61837)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-06-17 00:14:23 UTC (rev 61838)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26891
+  FORMAL BUILD NUMBER:26893
 */
 
-#define PRODUCT_VER_STRING "2.5.5.26891"
-#define FILE_VER_STRING "WI-V2.5.5.26891"
-#define LICENSE_VER_STRING "WI-V2.5.5.26891"
-#define FILE_VER_NUMBER 2, 5, 5, 26891
+#define PRODUCT_VER_STRING "2.5.5.26893"
+#define FILE_VER_STRING "WI-V2.5.5.26893"
+#define LICENSE_VER_STRING "WI-V2.5.5.26893"
+#define FILE_VER_NUMBER 2, 5, 5, 26893
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "5"
-#define FB_BUILD_NO "26891"
+#define FB_BUILD_NO "26893"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5"

Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2015-06-17 00:10:15 UTC (rev 61837)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2015-06-17 00:14:23 UTC (rev 61838)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=5
-BuildNum=26891
+BuildNum=26893
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.