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 | 3891d3315c7e95d3bc8082fa83a027ea103f0c1d (patch) | |
tree | 0fcc294e65f2ac0aa26f05054339eb7a5a9b040a /acconfig.h | |
parent | 9b4a6f81121adc9ad0737f7ca6b34d994a5ac506 (diff) | |
parent | c3fd0a7d73e1f76024daf0ce5ad1e2b92c5471b0 (diff) | |
download | mariadb-git-3891d3315c7e95d3bc8082fa83a027ea103f0c1d.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 |