* gdbserver/{remote-gutils.c remote-server.c Makefile.in

[deliverable/binutils-gdb.git] / gdb / energize.c

diff --git a/gdb/energize.c b/gdb/energize.c
index 9180eeb4bc33c8624a22e0a77f4ff7cb47f6ce5d..efee08e7fd2017b3b29ea5e2eac29396dc4b43fb 100644 (file)
--- a/gdb/energize.c
+++ b/gdb/energize.c
@@ -24,6 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "bfd.h"
 #include "symfile.h"
 #include "objfiles.h"
+#include "target.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/param.h>
@@ -1116,7 +1117,7 @@ kernel_dispatch(queue)
 
            while (*text == ' ' || *text == '\t') text++;
 
-           if (strcmp(text, "]*[") == 0) /* XXX - What does this mean??? */
+           if (STREQ(text, "]*[")) /* XXX - What does this mean??? */
              break;
 
            if (*text != '\000')
@@ -1575,9 +1576,9 @@ energize_call_command(cmdblk, arg, from_tty)
   else
     (*cmdblk->function.cfunc)(arg, from_tty);
 
-  if (strcmp(cmdblk->name, "up") == 0
-      || strcmp(cmdblk->name, "down") == 0
-      || strcmp(cmdblk->name, "frame") == 0)
+  if (STREQ(cmdblk->name, "up")
+      || STREQ(cmdblk->name, "down")
+      || STREQ(cmdblk->name, "frame"))
     send_location(get_frame_info(selected_frame)->pc,
                  selected_frame_level);
   print_prompt();
@@ -1619,11 +1620,7 @@ energize_wait(status)
   static sigset_t nullsigmask = {0};
 
   if (!energize)
-#ifdef USE_PROC_FS
-    return proc_wait (status);
-#else
-    return wait(status);
-#endif
+    return target_wait(status);
 
 #ifdef NCR486
   action.sa_handler = iosig;
@@ -1634,11 +1631,7 @@ energize_wait(status)
   signal(SIGIO, iosig);
 #endif
 
-#ifdef USE_PROC_FS
-  pid = proc_wait (status);
-#else
-  pid = wait(status);
-#endif
+  pid = target_wait(status);
 
   signal(SIGIO, SIG_IGN);
   return pid;