Applied all relevant upstream commits.

2018-03-08 22:15:52 -05:00
parent 139021f4c2
commit 98e920fb97
25 changed files with 4396 additions and 4372 deletions
--- a/src/pc.c
+++ b/src/pc.c
@@ -296,7 +296,9 @@ fatal(const char *fmt, ...)
 void
 pc_version(const char *platform)
 {
+#if defined(BUILD) || defined(COMMIT) || defined(UPSTREAM)
    char temp[128];
+#endif

    sprintf(emu_title, "%s for %s", EMU_NAME, platform);