← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Monty Taylor
  • Date: 2008-07-15 21:40:58 UTC
  • mfrom: (77.1.113 codestyle32)
  • mto: This revision was merged to the branch mainline in revision 176.
  • Revision ID: mordred@camelot-20080715214058-rm3phulldos9xehv
Merged from codestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/include/univ.i
9
9
#ifndef univ_i
10
10
#define univ_i
11
11
 
12
 
#if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(DRIZZLE_SERVER) && !defined(__WIN__)
 
12
#if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(MYSQL_SERVER) && !defined(__WIN__)
13
13
# undef __WIN__
14
14
# define __WIN__
15
15
 
30
30
in compiling more Posix-compatible. These headers also define __WIN__
31
31
if we are compiling on Windows. */
32
32
 
33
 
# include <drizzled/global.h>
34
 
# include <mysys/my_pthread.h>
 
33
# include <my_global.h>
 
34
# include <my_pthread.h>
35
35
 
36
36
/* Include <sys/stat.h> to get S_I... macros defined for os0file.c */
37
37
# include <sys/stat.h>