firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 19:23:03 +01:00
Code Issues

Restore intl_backend as intl_builtin (needed by Nickolay)

Browse Source
This commit is contained in:
brodsom 2003-02-25 00:46:57 +00:00
parent 32040546c9
commit fe4bbf557b
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/jrd/intl.cpp
View File

@ -105,6 +105,9 @@
#include "../intl/country_codes.h"
#include "../jrd/gdsassert.h"
#include "../jrd/license.h"
#ifdef INTL_BUILTIN
#include "../intl/ld_proto.h"
#endif
#include "../jrd/all_proto.h"
#include "../jrd/cvt_proto.h"
#include "../jrd/err_proto.h"
@ -2159,6 +2162,10 @@ static void* intl_back_compat_obj_init_lookup(
function = NULL;
#ifdef INTL_BUILTIN
if (LD_lookup(type, &function, parm1, parm2) != 0)
function = NULL;
#else
/* Look for an InterBase supplied object to implement the text type */
/* The flu.c uses searchpath which expects a file name not a path */
INTL_TRACE(("INTL: trying %s %s\n", INTL_MODULE1, INTL_LOOKUP_ENTRY1));
@ -2175,8 +2182,13 @@ static void* intl_back_compat_obj_init_lookup(
return (void*) function;
}
}
#endif
/* Still not found, check the set of supplimental international objects */
#ifdef INTL_BUILTIN
if (LD2_lookup(type, &function, parm1, parm2) != 0)
function = NULL
#else
/* Look for an InterBase supplied object to implement the text type */
/* The flu.c uses searchpath which expects a file name not a path */
INTL_TRACE(("INTL: trying %s %s\n", INTL_MODULE2, INTL_LOOKUP_ENTRY2));
@ -2193,6 +2205,7 @@ static void* intl_back_compat_obj_init_lookup(
return (void*) function;
}
}
#endif
/* Still not found, check if there is a UDF in the database defined the right way */
FUN function_block;