diff options
| author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-09-28 15:18:33 -0400 |
|---|---|---|
| committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-09-28 15:18:33 -0400 |
| commit | 69aa7b40c22994fce94029f11fcdc5e1c7dabcaf (patch) | |
| tree | 990ddb541b9830fa9f5c72610490e1c97332282c /innobase/include/univ.i | |
| parent | a9be99af8371a82be482b9a1b711da188008bff3 (diff) | |
| download | mariadb-git-69aa7b40c22994fce94029f11fcdc5e1c7dabcaf.tar.gz | |
Bug#22224: Windows build depends on ib_config.h
This change has already been made to 5.1.
CMakeLists.txt:
Removed dependancy on ib_config.h
Added conditionals for InnoDB and BDB directories.
innobase/include/univ.i:
ib_config.h is not required for Windows.
Diffstat (limited to 'innobase/include/univ.i')
| -rw-r--r-- | innobase/include/univ.i | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i index bc3bd031f0c..64a240ae8a7 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -39,8 +39,10 @@ if we are compiling on Windows. */ #undef PACKAGE #undef VERSION +#if !defined(__WIN__) && !defined(WIN64) && !defined(_WIN64) /* Include the header file generated by GNU autoconf */ #include "../ib_config.h" +#endif #ifdef HAVE_SCHED_H #include <sched.h> |