diff options
author | unknown <tim@cane.mysql.fi> | 2000-12-21 12:00:09 +0200 |
---|---|---|
committer | unknown <tim@cane.mysql.fi> | 2000-12-21 12:00:09 +0200 |
commit | a09659dd577dcf4c9ff907c680df0abf011d047c (patch) | |
tree | 0fcc294e65f2ac0aa26f05054339eb7a5a9b040a /acconfig.h | |
parent | a9db7b74980cd4644fe2ee04e3d99bdaeed2072b (diff) | |
parent | 9cecbe9bc20c1d888b9cb8a49a55b48a305166ae (diff) | |
download | mariadb-git-a09659dd577dcf4c9ff907c680df0abf011d047c.tar.gz |
Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
acconfig.h:
Auto merged
configure.in:
Auto merged
Diffstat (limited to 'acconfig.h')
-rw-r--r-- | acconfig.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/acconfig.h b/acconfig.h index 986bf90fd42..b0b6a3aae64 100644 --- a/acconfig.h +++ b/acconfig.h @@ -189,6 +189,9 @@ /* Define as the base type of the last arg to accept */ #undef SOCKET_SIZE_TYPE +/* Last argument to get/setsockopt */ +#undef SOCKOPT_OPTLEN_TYPE + #undef SPEED_T_IN_SYS_TYPES #undef SPRINTF_RETURNS_PTR #undef SPRINTF_RETURNS_INT |