It looks like I pulled the diff against the non-clean source.
Approved by: philip (mentor, implicit)
This commit is contained in:
parent
82dabcefbe
commit
00c795fb59
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=215835
2 changed files with 8 additions and 6 deletions
|
@ -1,12 +1,13 @@
|
|||
--- kdecore/kpty.cpp
|
||||
+++ kdecore/kpty.cpp
|
||||
@@ -127,9 +127,15 @@
|
||||
@@ -127,10 +127,15 @@
|
||||
#include <kdebug.h>
|
||||
#include <kstandarddirs.h> // locate
|
||||
|
||||
-// not defined on HP-UX for example
|
||||
-#undef CTRL
|
||||
-#define CTRL(x) ((x) & 037)
|
||||
-#ifndef CTRL
|
||||
-# define CTRL(x) ((x) & 037)
|
||||
-#endif
|
||||
+#ifndef CINTR
|
||||
+#define CINTR 0x03
|
||||
+#endif
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
--- kdecore/kpty.cpp
|
||||
+++ kdecore/kpty.cpp
|
||||
@@ -127,9 +127,15 @@
|
||||
@@ -127,10 +127,15 @@
|
||||
#include <kdebug.h>
|
||||
#include <kstandarddirs.h> // locate
|
||||
|
||||
-// not defined on HP-UX for example
|
||||
-#undef CTRL
|
||||
-#define CTRL(x) ((x) & 037)
|
||||
-#ifndef CTRL
|
||||
-# define CTRL(x) ((x) & 037)
|
||||
-#endif
|
||||
+#ifndef CINTR
|
||||
+#define CINTR 0x03
|
||||
+#endif
|
||||
|
|
Loading…
Reference in a new issue