From 880401913d6190054bb0511093606a206b16326c Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Tue, 9 Sep 2014 10:39:55 -0300 Subject: [PATCH] Linux 3.17: No more typedef for ctl_table The typedef has been removed so we need to use the structure directly. Note that the API for register_sysctl_table has also changed with 3.17, but it reverted back to a form that existed before and the configure tests handle it correctly. Change-Id: If1fd9d27f795dee4b5aa2152dd09e0540d643a69 --- src/afs/LINUX/osi_sysctl.c | 4 ++-- src/cf/linux-test4.m4 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c index a8f7fac..834e8ad 100644 --- a/src/afs/LINUX/osi_sysctl.c +++ b/src/afs/LINUX/osi_sysctl.c @@ -34,7 +34,7 @@ extern afs_int32 afs_pct2; #ifdef CONFIG_SYSCTL static struct ctl_table_header *afs_sysctl = NULL; -static ctl_table afs_sysctl_table[] = { +static struct ctl_table afs_sysctl_table[] = { { #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) #if defined(CTL_UNNUMBERED) @@ -234,7 +234,7 @@ static ctl_table afs_sysctl_table[] = { {0} }; -static ctl_table fs_sysctl_table[] = { +static struct ctl_table fs_sysctl_table[] = { { #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) #if defined(CTL_UNNUMBERED) diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 index dad91d9..228b491 100644 --- a/src/cf/linux-test4.m4 +++ b/src/cf/linux-test4.m4 @@ -395,7 +395,7 @@ AC_DEFUN([LINUX_REGISTER_SYSCTL_TABLE_NOFLAG], [ AC_CHECK_LINUX_BUILD([whether register_sysctl_table has an insert_at_head argument], [ac_cv_linux_register_sysctl_table_noflag], [#include ], - [ctl_table *t; register_sysctl_table (t);], + [struct ctl_table *t; register_sysctl_table (t);], [REGISTER_SYSCTL_TABLE_NOFLAG], [define if register_sysctl_table has no insert_at head flag], []) -- 1.7.1