← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/univ.i

Merge trunk changes and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/univ.i
106
106
in compiling more Posix-compatible. These headers also define __WIN__
107
107
if we are compiling on Windows. */
108
108
 
109
 
# if defined(BUILD_DRIZZLE)
110
 
#  include "drizzled/internal/my_pthread.h"
111
 
# else
 
109
# if !defined(BUILD_DRIZZLE)
112
110
#  ifndef UNIV_HOTBACKUP
113
111
#   include <my_global.h>
114
112
#   include <my_pthread.h>