summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2013-07-23 14:50:41 +0200
committerJaroslav Kysela <perex@perex.cz>2013-07-23 14:50:41 +0200
commitb3b53a1bec47aaa2baef724cc9e79adadd603caf (patch)
tree3ef1a966296a25f1d50e24c49b792893aa30a396
parent12a2928b9dc6facfbc294d09e25e85f808d92be9 (diff)
local.h: use __kernel_off_t from <linux/types.h>
Also, make the empty definitions __user and __force conditional. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r--include/local.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/local.h b/include/local.h
index 53cb647d..f0db188e 100644
--- a/include/local.h
+++ b/include/local.h
@@ -32,6 +32,7 @@
#include <stdarg.h>
#include <sys/poll.h>
#include <errno.h>
+#include <linux/types.h>
#include <linux/ioctl.h>
#include "config.h"
@@ -114,9 +115,12 @@
#define snd_ctl_tlv sndrv_ctl_tlv
/* kill and replace kernel-specific types */
+#ifndef __user
#define __user
+#endif
+#ifndef __force
#define __force
-#define __kernel_off_t off_t
+#endif
#include <sound/asound.h>