← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_fn_ext.cc

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_fn_ext.cc
37
37
{
38
38
  register const char *pos, *gpos;
39
39
 
40
 
#if defined(FN_DEVCHAR) || defined(FN_C_AFTER_DIR)
 
40
#if defined(FN_DEVCHAR)
41
41
  {
42
42
    char buff[FN_REFLEN];
43
43
    size_t res_length;