summaryrefslogtreecommitdiff
path: root/acconfig.h
diff options
context:
space:
mode:
authortim@cane.mysql.fi <>2000-12-21 12:00:09 +0200
committertim@cane.mysql.fi <>2000-12-21 12:00:09 +0200
commit7e3fd8ce798c681cdbe18dcdecb563f63160166c (patch)
tree0fcc294e65f2ac0aa26f05054339eb7a5a9b040a /acconfig.h
parent45d537d58014587caa1f61a2d69a9fc7bbaa0856 (diff)
parent6ea697884728f9b05cc8604154788dbf7d108406 (diff)
downloadmariadb-git-7e3fd8ce798c681cdbe18dcdecb563f63160166c.tar.gz
Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
Diffstat (limited to 'acconfig.h')
-rw-r--r--acconfig.h3
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