2004-11-26 Alain Magloire

	Fix for PR 79582
	* src/org/eclipse/cdt/debug/mi/core/CygwinGDBCDIDebugger.java
	* src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java

3 files changed, 13 insertions, 8 deletions

diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index 8cc72dad11a..7125f639aef 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-26 Alain Magloire
+	Fix for PR 79582
+	* src/org/eclipse/cdt/debug/mi/core/CygwinGDBCDIDebugger.java
+	* src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java
+
 2004-11-24 Alain Magloire
 	Make the terminate() more responsive when gdb is shuting down.
 	See long discussion part of the 77435 fixes and 40087.
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBCDIDebugger.java
index 51b921c98c9..471cc32d9f4 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBCDIDebugger.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBCDIDebugger.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.cdt.debug.mi.core;
 
-import org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable;
+import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
 import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
 import org.eclipse.cdt.debug.mi.core.cdi.Session;
 import org.eclipse.cdt.debug.mi.core.cdi.model.Target;
@@ -32,7 +32,7 @@ public class CygwinGDBCDIDebugger extends GDBCDIDebugger {
 		// the "search-solib-path" and "stop-on-solib-events" options are not supported in CygWin
 	}
 
-	public Session createLaunchSession(ILaunchConfiguration config, IBinaryExecutable exe, IProgressMonitor monitor) throws CoreException {
+	public Session createLaunchSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException {
 		Session session = super.createLaunchSession(config, exe, monitor);
 		ICDITarget[] targets = session.getTargets();
 		for (int i = 0; i < targets.length; ++i) {
@@ -57,7 +57,7 @@ public class CygwinGDBCDIDebugger extends GDBCDIDebugger {
 		return session;
 	}
 
-	public Session createAttachSession(ILaunchConfiguration config, IBinaryExecutable exe, IProgressMonitor monitor) throws CoreException {
+	public Session createAttachSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException {
 		Session session = super.createAttachSession(config, exe, monitor);
 		ICDITarget[] targets = session.getTargets();
 		for (int i = 0; i < targets.length; ++i) {
@@ -68,7 +68,7 @@ public class CygwinGDBCDIDebugger extends GDBCDIDebugger {
 		return session;
 	}
 
-	public Session createCoreSession(ILaunchConfiguration config, IBinaryExecutable exe, IProgressMonitor monitor) throws CoreException {
+	public Session createCoreSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException {
 		Session session = super.createCoreSession(config, exe, monitor);
 		ICDITarget[] targets = session.getTargets();
 		for (int i = 0; i < targets.length; ++i) {
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java
index de2c4468c7b..37cdb6fe6dc 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java
@@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.mi.core;
 
 import java.io.File;
 
-import org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable;
+import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
 import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
 import org.eclipse.cdt.debug.mi.core.cdi.Session;
 import org.eclipse.cdt.debug.mi.core.cdi.model.Target;
@@ -37,7 +37,7 @@ public class GDBServerCDIDebugger extends GDBCDIDebugger {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger#createLaunchSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor)
 	 */
-	public Session createLaunchSession(ILaunchConfiguration config, IBinaryExecutable exe, IProgressMonitor monitor)
+	public Session createLaunchSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor)
 			throws CoreException {
 		Session session = null;
 		boolean failed = false;
@@ -105,7 +105,7 @@ public class GDBServerCDIDebugger extends GDBCDIDebugger {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger#createAttachSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor)
 	 */
-	public Session createAttachSession(ILaunchConfiguration config, IBinaryExecutable exe, IProgressMonitor monitor)
+	public Session createAttachSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor)
 			throws CoreException {
 		String msg = MIPlugin.getResourceString("src.GDBServerDebugger.GDBServer_attaching_unsupported"); //$NON-NLS-1$
 		throw newCoreException(msg, null);
@@ -114,7 +114,7 @@ public class GDBServerCDIDebugger extends GDBCDIDebugger {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger#createCoreSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor)
 	 */
-	public Session createCoreSession(ILaunchConfiguration config, IBinaryExecutable exe, IProgressMonitor monitor)
+	public Session createCoreSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor)
 			throws CoreException {
 		String msg = MIPlugin.getResourceString("src.GDBServerDebugger.GDBServer_corefiles_unsupported"); //$NON-NLS-1$
 		throw newCoreException(msg, null);