diff libgui/src/octave-gui.cc @ 15368:36ececf69385

avoid some GCC warnings in the libgui code * file-editor-interface.h, lexer-octave-gui.cc, main-window.cc, settings-dialog.cc, workspace-model.cc, workspace-view.cc: Avoid some shadowed variable, unused switch case, and C-style cast warnings.
author John W. Eaton <jwe@octave.org>
date Wed, 12 Sep 2012 20:32:57 -0400
parents a3c8a3c2dbda
children e4ecc18a24cc
line wrap: on
line diff
--- a/libgui/src/octave-gui.cc	Wed Sep 12 16:34:39 2012 -0400
+++ b/libgui/src/octave-gui.cc	Wed Sep 12 20:32:57 2012 -0400
@@ -30,7 +30,8 @@
 
 #include <iostream>
 
-#include <syswait.h>
+#include "lo-utils.h"
+#include "syswait.h"
 
 #include "welcome-wizard.h"
 #include "resource-manager.h"
@@ -69,7 +70,8 @@
 
       waitpid (pid, &status, 0);
 
-      exit (WIFEXITED (status) ? WEXITSTATUS (status) : 127);
+      exit (octave_wait::ifexited (status)
+            ? octave_wait::exitstatus (status) : 127);
     }
 
 #endif