[Firebird-checkins] SF.net SVN: firebird:[61883] firebird/trunk

[<asf...@us...>]

Revision: 61883
          http://sourceforge.net/p/firebird/code/61883
Author:   asfernandes
Date:     2015-06-29 01:38:16 +0000 (Mon, 29 Jun 2015)
Log Message:
-----------
This should fix the problem of building examples in Windows 64-bit, although it does not answear what exactly is happening there.

Modified Paths:
--------------
    firebird/trunk/builds/posix/Makefile.in.examples
    firebird/trunk/src/gpre/std/gpre_meta.epp

Modified: firebird/trunk/builds/posix/Makefile.in.examples
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.examples	2015-06-29 01:02:52 UTC (rev 61882)
+++ firebird/trunk/builds/posix/Makefile.in.examples	2015-06-29 01:38:16 UTC (rev 61883)
@@ -57,7 +57,7 @@
 #LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(GEN_ROOT)/firebird/lib
 #export LD_LIBRARY_PATH
 #endif
-GPRE_FLAGS=	-r -m -z -n
+GPRE_FLAGS=	-m -z -n
 
 LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),$(LIB),$(LIB)/../intl))
 LIB_LINK_MAPFILE =

Modified: firebird/trunk/src/gpre/std/gpre_meta.epp
===================================================================
--- firebird/trunk/src/gpre/std/gpre_meta.epp	2015-06-29 01:02:52 UTC (rev 61882)
+++ firebird/trunk/src/gpre/std/gpre_meta.epp	2015-06-29 01:38:16 UTC (rev 61883)
@@ -886,7 +886,7 @@
 	{
 	case blr_varying:
 	case blr_text:
-		if (char_length != 0)
+		if (char_length != 0 && sub_type != dsc_text_type_none)
 			l = char_length * 4;
 
 		dtype = dtype_text;
@@ -899,7 +899,7 @@
 
 	case blr_cstring:
 		dtype = dtype_cstring;
-		if (char_length != 0)
+		if (char_length != 0 && sub_type != dsc_text_type_none)
 			l = char_length * 4;
 		++l;
 		break;

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