[PATCH] fix the build with CONFIG_UNIX98_PTYS=n

From: Ian Wienand <ianw@gelato.unsw.edu.au>

- Fix inline function declarations

- Use #ifdef for CONFIG_*, not #if

diff --git a/include/linux/devpts_fs.h b/include/linux/devpts_fs.h
index 734f7ea9e835d9286ec9d586fc3b4615d18e2413..b672ddc007357bc2cd5395d34e6102f6870315a6 100644 (file)
--- a/include/linux/devpts_fs.h
+++ b/include/linux/devpts_fs.h
@@ -11,22 +11,22 @@
  * ------------------------------------------------------------------------- */
 
 #ifndef _LINUX_DEVPTS_FS_H
-#define _LINUX_DEVPTS_FS_H 1
+#define _LINUX_DEVPTS_FS_H
 
 #include <linux/errno.h>
 
-#if CONFIG_UNIX98_PTYS
+#ifdef CONFIG_UNIX98_PTYS
 
-int devpts_pty_new(struct tty_struct *); /* mknod in devpts */
-struct tty_struct *devpts_get_tty(int);         /* get tty structure */
-void devpts_pty_kill(int);              /* unlink */
+int devpts_pty_new(struct tty_struct *tty);      /* mknod in devpts */
+struct tty_struct *devpts_get_tty(int number);  /* get tty structure */
+void devpts_pty_kill(int number);               /* unlink */
 
 #else
 
 /* Dummy stubs in the no-pty case */
-static inline int devpts_pty_new(struct tty_struct *) { return -EINVAL; }
-static inline struct tty_struct *devpts_get_tty(int)  { return NULL; }
-static inline void devpts_pty_kill(int) { }
+static inline int devpts_pty_new(struct tty_struct *tty) { return -EINVAL; }
+static inline struct tty_struct *devpts_get_tty(int number) { return NULL; }
+static inline void devpts_pty_kill(int number) { }
 
 #endif