diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 14:54:05 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 14:54:05 -0300 |
| commit | 508d060d628076d6f0e0a64cdaf566bf86c8a5bb (patch) | |
| tree | 9d3e26ddf1416e0c0e16aa363db92f66511437f2 /include/mysql.h | |
| parent | 182d1dd875ec067b9ab04b99ac31dad5235c6223 (diff) | |
| parent | c36fee08f6fa7974324438572a260101335cb4b4 (diff) | |
| download | mariadb-git-508d060d628076d6f0e0a64cdaf566bf86c8a5bb.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h index 7eef91cf55a..dc6e4eb19a6 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -44,7 +44,9 @@ extern "C" { #endif #ifndef _global_h /* If not standard header */ +#ifndef MYSQL_ABI_CHECK #include <sys/types.h> +#endif #ifdef __LCC__ #include <winsock2.h> /* For windows */ #endif |