← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_symlink2.cc

  • Committer: Joe Daly
  • Date: 2009-09-15 01:32:36 UTC
  • mto: (1126.9.1 captain-20090915-01)
  • mto: This revision was merged to the branch mainline in revision 1133.
  • Revision ID: skinny.moey@gmail.com-20090915013236-bum21ioqapia0qk7
changes to allow -Wconversion flag to be turned on

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_symlink2.cc
134
134
  char link_name[FN_REFLEN], tmp_name[FN_REFLEN];
135
135
  int sym_link_size= -1;
136
136
  int was_symlink= (!my_disable_symlinks &&
137
 
                   (sym_link_size= readlink(from,link_name,FN_REFLEN-1)) != -1);
 
137
                   (sym_link_size= static_cast<int>(readlink(from,link_name,
 
138
                                                    FN_REFLEN-1))) != -1); 
138
139
  int result=0;
139
140
  int name_is_different;
140
141