HPMERGE:

More wrong uses of gdb_stderr and stderr/stdout.
More upddates to calls of catch_errors() so that call matches new interface.

1 files changed, 4 insertions, 4 deletions

diff --git a/gdb/ocd.c b/gdb/ocd.c
index 0af8103..343fa62 100644
--- a/gdb/ocd.c
+++ b/gdb/ocd.c
@@ -41,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 static int ocd_read_bytes PARAMS ((CORE_ADDR memaddr,
 				      char *myaddr, int len));
 
-static int ocd_start_remote PARAMS ((char *dummy));
+static int ocd_start_remote PARAMS ((PTR dummy));
 
 static int readchar PARAMS ((int timeout));
 
@@ -145,7 +145,7 @@ ocd_close (quitting)
 
 static int
 ocd_start_remote (dummy)
-     char *dummy;
+     PTR dummy;
 {
   unsigned char buf[10], *p;
   int pktlen;
@@ -154,7 +154,7 @@ ocd_start_remote (dummy)
   int speed;
   enum ocd_target_type target_type;
 
-  target_type = (enum ocd_target_type)dummy;
+  target_type = *(enum ocd_target_type*)dummy;
 
   immediate_quit = 1;		/* Allow user to interrupt it */
 
@@ -330,7 +330,7 @@ device the OCD device is attached to (e.g. /dev/ttya).");
   /* Start the remote connection; if error (0), discard this target.
      In particular, if the user quits, be sure to discard it
      (we'd be in an inconsistent state otherwise).  */
-  if (!catch_errors (ocd_start_remote, (char *)target_type,
+  if (!catch_errors (ocd_start_remote, &target_type,
 		     "Couldn't establish connection to remote target\n",
 		     RETURN_MASK_ALL))
     {