diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-23 10:54:12 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-23 10:54:12 +0200 |
| commit | adb261ec4dc3cad0dff1133784e70679e22206a7 (patch) | |
| tree | b3064f15eee53d0ff97d9877fadf42f4ab8bd224 /libmysql | |
| parent | 87e036a233558d1867b9280679e302f7cc997bee (diff) | |
| parent | 11572916ffb543e5b89db156a46a265d251bf768 (diff) | |
| download | mariadb-git-adb261ec4dc3cad0dff1133784e70679e22206a7.tar.gz | |
Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
sql/ha_innobase.h:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/violite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/violite.c b/libmysql/violite.c index 721e6c8d81c..932861b10c2 100644 --- a/libmysql/violite.c +++ b/libmysql/violite.c @@ -39,7 +39,7 @@ #include <sys/ioctl.h> #endif -#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) +#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__FreeBSD__) #include <netinet/ip.h> #if !defined(alpha_linux_port) #include <netinet/tcp.h> |