summaryrefslogtreecommitdiff
path: root/package/gpm/patches/patch-src_daemon_open_console_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-08 12:58:54 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-08 12:58:54 +0100
commitf3e1c3cf993b0ba54afa0ff9552ffefd39828b23 (patch)
tree1f5d52b7dff4a5c60e17c8f0fd7f7412c946a0ee /package/gpm/patches/patch-src_daemon_open_console_c
parentd77656116191a166ed0477cf16830480a2406fc5 (diff)
parentd93c019f2cfdf53be59f02600cc25c547ba24edc (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/gpm/patches/patch-src_daemon_open_console_c')
-rw-r--r--package/gpm/patches/patch-src_daemon_open_console_c19
1 files changed, 9 insertions, 10 deletions
diff --git a/package/gpm/patches/patch-src_daemon_open_console_c b/package/gpm/patches/patch-src_daemon_open_console_c
index 28bd57e11..9ead6ea40 100644
--- a/package/gpm/patches/patch-src_daemon_open_console_c
+++ b/package/gpm/patches/patch-src_daemon_open_console_c
@@ -1,12 +1,11 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- gpm-1.20.5.orig/src/daemon/open_console.c 2008-06-13 10:08:19.000000000 +0200
-+++ gpm-1.20.5/src/daemon/open_console.c 2008-09-16 17:11:51.000000000 +0200
-@@ -21,7 +21,7 @@
+--- gpm-1.20.7.orig/src/daemon/open_console.c 2012-10-26 23:21:38.000000000 +0200
++++ gpm-1.20.7/src/daemon/open_console.c 2013-12-22 12:54:02.000000000 +0100
+@@ -27,6 +27,8 @@
+ #include <linux/serial.h> /* for serial console check */
+ #include <asm/ioctls.h> /* for serial console check */
- #include <fcntl.h> /* open and co. */
- #include <sys/stat.h> /* stat() */
--#include <stropts.h> /* ioctl */
-+#include <sys/ioctl.h> /* ioctl */
++#define major(dev) (((unsigned) (dev))>>8)
++#define minor(dev) ((dev)&0xff)
- /* Linux specific (to be outsourced in gpm2 */
- #include <linux/serial.h> /* for serial console check */
+ #include "headers/message.h" /* messaging in gpm */
+ #include "headers/daemon.h" /* daemon internals */