Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMartin Oberhuber2015-09-16 21:11:44 +0000
committerGerrit Code Review @ Eclipse.org2015-09-17 16:15:37 +0000
commit6a17a26b22389ce952624a54892d1431b6a437fe (patch)
tree51a04b4d3dfc0685eb0fe6274a58081dd77bf1c4 /core
parentd334be2c61c1092c323318c9b1e15de26b8b189b (diff)
downloadorg.eclipse.cdt-6a17a26b22389ce952624a54892d1431b6a437fe.tar.gz
org.eclipse.cdt-6a17a26b22389ce952624a54892d1431b6a437fe.tar.xz
org.eclipse.cdt-6a17a26b22389ce952624a54892d1431b6a437fe.zip
Bug 476709 - MacOSX PTY: Fix terminal change_window_size
Change-Id: I89b8c26f65671eaca20a0a5affb20c565f557419 Signed-off-by: Martin Oberhuber <martin.oberhuber@windriver.com>
Diffstat (limited to 'core')
-rw-r--r--core/org.eclipse.cdt.core.macosx/library/Makefile5
-rw-r--r--core/org.eclipse.cdt.core.macosx/library/pty.c8
-rwxr-xr-xcore/org.eclipse.cdt.core.macosx/os/macosx/x86/libpty.jnilibbin9868 -> 9844 bytes
-rwxr-xr-xcore/org.eclipse.cdt.core.macosx/os/macosx/x86/libspawner.jnilibbin15724 -> 19748 bytes
-rwxr-xr-x[-rw-r--r--]core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libpty.jnilibbin9896 -> 9868 bytes
-rwxr-xr-x[-rw-r--r--]core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libspawner.jnilibbin19944 -> 19880 bytes
6 files changed, 9 insertions, 4 deletions
diff --git a/core/org.eclipse.cdt.core.macosx/library/Makefile b/core/org.eclipse.cdt.core.macosx/library/Makefile
index a184aa5f8e..215f7d6ded 100644
--- a/core/org.eclipse.cdt.core.macosx/library/Makefile
+++ b/core/org.eclipse.cdt.core.macosx/library/Makefile
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2002, 2009 QNX Software Systems and others.
+# Copyright (c) 2002, 2015 QNX Software Systems and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -8,12 +8,13 @@
# Contributors:
# QNX Software Systems - initial API and implementation
# Alex Blewitt - MacOSX with a 64-bit vm
+# Martin Oberhuber (Wind River) - Bug 476709 - Fix change_window_size()
#*******************************************************************************/
# makefile for libspawner.so
# See http://developer.apple.com/documentation/Java/Conceptual/Java141Development/Core_APIs/chapter_6_section_4.html
-JAVA_HOME = $(shell echo /Library/Java/JavaVirtualMachines/jdk1.8.0_*.jdk/Contents/Home)
+JAVA_HOME = $(shell echo /Library/Java/JavaVirtualMachines/jdk1.[78].0_*.jdk/Contents/Home)
# Defaults which can be overridden.
OS = macosx
diff --git a/core/org.eclipse.cdt.core.macosx/library/pty.c b/core/org.eclipse.cdt.core.macosx/library/pty.c
index e7c23e8fbc..5d813bd0a7 100644
--- a/core/org.eclipse.cdt.core.macosx/library/pty.c
+++ b/core/org.eclipse.cdt.core.macosx/library/pty.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2009 QNX Software Systems and others.
+ * Copyright (c) 2002, 2015 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,10 +7,13 @@
*
* Contributors:
* QNX Software Systems - initial API and implementation
+ * Martin Oberhuber (Wind River) - Bug 476709 - Fix change_window_size()
*******************************************************************************/
#include "PTY.h"
#include "openpty.h"
+#include <sys/ioctl.h>
+
/*
* Class: org_eclipse_cdt_utils_pty_PTY
* Method: forkpty
@@ -52,7 +55,7 @@ Java_org_eclipse_cdt_utils_pty_PTY_openMaster (JNIEnv *env, jobject jobj, jboole
JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_change_1window_1size
(JNIEnv *env, jobject jobj, jint fdm, jint width, jint height)
{
-#ifdef TIOCGWINSZ
+#ifdef TIOCSWINSZ
struct winsize win;
win.ws_col = width;
@@ -62,6 +65,7 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_change_1window_1size
return ioctl(fdm, TIOCSWINSZ, &win);
#else
+#error no TIOCSWINSZ
return 0;
#endif
}
diff --git a/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libpty.jnilib b/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libpty.jnilib
index 49ad7a7f74..942b4bad8c 100755
--- a/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libpty.jnilib
+++ b/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libpty.jnilib
Binary files differ
diff --git a/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libspawner.jnilib b/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libspawner.jnilib
index 1377d5d2b5..dffccabbb6 100755
--- a/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libspawner.jnilib
+++ b/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libspawner.jnilib
Binary files differ
diff --git a/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libpty.jnilib b/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libpty.jnilib
index e0577a8079..904d236924 100644..100755
--- a/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libpty.jnilib
+++ b/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libpty.jnilib
Binary files differ
diff --git a/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libspawner.jnilib b/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libspawner.jnilib
index 06c3818a5b..2d41d7d66e 100644..100755
--- a/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libspawner.jnilib
+++ b/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libspawner.jnilib
Binary files differ

Back to the top