Merge branch 'master' of https://github.com/stella-emu/stella

docs/debugger.html

@@ -311,7 +311,7 @@ more convenient.
   </li>
   <li>
     "&lt;rom_filename&gt;.sym" (located in the same directory as the ROM)</br>
-    If you provied the -l and -s parameters DASM will create these two files during
+    If you provide the -l and -s parameters DASM will create these two files during
     assembly. Stella uses the file content to display the correct labels.
   </li>
 </ul>
@@ -1107,7 +1107,7 @@ VDELBL selects the register that is used to control the ball. This is
 visualized in the debugger in the same way as the two copies of GRP0 and
 GRP1</p>
 
-<p>For many registers, writes don't take effect immediatelly as the
+<p>For many registers, writes don't take effect immediately as the
 TIA takes some color clocks to change state. In Stella's TIA core, this
 is implemented by queueing the writes, and the contents of this queue
 are visualized in the debugger in the "Queued Writes" area of the TIA tab.</p>
@@ -1594,7 +1594,7 @@ disassembly line's address and bank</li>
 isn't already a defined label).</li>
 
 <li><b>Show GFX as binary</b>: Switch between displaying/editing GFX and PGFX sections
-in either binary or hexidecimal.</li>
+in either binary or hexadecimal.</li>
 
 <li><b>Use address relocation</b>: Corresponds to the DiStella '-r' option
 (Relocate calls out of address range).</br>

src/emucore/Settings.cxx

@@ -37,8 +37,8 @@
 //#endif
 
 #if defined(BSPF_UNIX) || defined(BSPF_MACOS)
+#include <cstdio>
 #include <sys/ioctl.h>
-#include <stdio.h>
 #include <unistd.h>
 #endif
 
@@ -843,7 +843,7 @@ void Settings::usage()
     {
       row = 0;
       cout << "Press \"Enter\"" << std::flush;
-      getchar();
+      std::ignore = getchar();
       cout << endl;
     }
     string substr;