← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/library.cc

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/library.cc
68
68
  dlpath.append("/");
69
69
  dlpath.append("lib");
70
70
  dlpath.append(plugin_name);
71
 
  dlpath.append("_plugin.so");
 
71
  dlpath.append("_plugin");
 
72
#if defined(TARGET_OS_OSX)
 
73
  dlpath.append(".dylib");
 
74
#else
 
75
  dlpath.append(".so");
 
76
#endif
72
77
 
73
78
  /* Open new dll handle */
74
79
  void *handle= dlopen(dlpath.c_str(), RTLD_NOW|RTLD_GLOBAL);