From 6f9f26951c70e051b06c0345079beb92545b73d3 Mon Sep 17 00:00:00 2001
From: waltje <decwiz@yahoo.com>
Date: Tue, 8 May 2018 18:57:10 -0400
Subject: [PATCH] Updated travis (again..) and some code changes.

---
 .travis.yml              | 18 ++++++++----------
 src/machines/m_amstrad.c |  3 ++-
 src/ui/ui_main.c         |  4 +---
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3538eb7..c1f57e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@
 #
 #		Project file for the Travis CI remote builder service.
 #
-# Version:	@(#).travis.yml	1.0.10	2018/05/08
+# Version:	@(#).travis.yml	1.0.11	2018/05/08
 #
 # Authors:	Natalia Portillo, <claunia@claunia.com>
 #		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -61,16 +61,14 @@ env:
     - PROG=VACRCem-dev CROSS=y DEBUG=y DEV_BUILD=y
 
 before_install:
-  - sudo ps aux | grep apt
-  - sudo ps aux | grep dpkg
-  - sudo rm -f /var/lib/dpkg/lock
-  - sleep 10
+  # Kill off the (most likely running) APT daily update.
+  - sudo systemctl stop apt-daily.service
+  - sudo systemctl kill --kill-who=all apt-daily.service
+  - sleep 5
   - sudo apt-get install libz-mingw-w64-dev
 # - sudo apt-get install libpng-mingw-w64-dev
 
 script:
-  - ls -l /usr/i686-w64-mingw32/include
-  - ls -l /usr/i686-w64-mingw32/lib
   - chmod +x .travis-build.sh .travis-deploy.sh
   - ./.travis-build.sh
 
@@ -83,9 +81,9 @@ addons:
       - gcc-mingw-w64-x86-64
       - gcc-mingw-w64
       - mingw-w64
-      - libz-mingw-w64
-      - libz-mingw-w64-dev
-      - libpng-mingw-w64-dev
+# These do not seem to be installed from here..
+#     - libz-mingw-w64-dev
+#     - libpng-mingw-w64-dev
 
 notifications:
   irc:
diff --git a/src/machines/m_amstrad.c b/src/machines/m_amstrad.c
index 8a75f30..a033dee 100644
--- a/src/machines/m_amstrad.c
+++ b/src/machines/m_amstrad.c
@@ -32,7 +32,7 @@
  *  BIOSES:	I need to re-do the bios.txt format so we can load non-BIOS
  *		ROM files for a given machine, such as font roms here..
  *
- * Version:	@(#)m_amstrad.c	1.0.16	2018/05/06
+ * Version:	@(#)m_amstrad.c	1.0.17	2018/05/08
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -73,6 +73,7 @@
 #include "../timer.h"
 #include "../device.h"
 #include "../nvr.h"
+#include "../ui/ui.h"
 #include "../devices/system/nmi.h"
 #include "../devices/system/pic.h"
 #include "../devices/system/pit.h"
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 88f3575..3269df0 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -11,7 +11,7 @@
  *		This code is called by the UI frontend modules, and, also,
  *		depends on those same modules for lower-level functions.
  *
- * Version:	@(#)ui_main.c	1.0.10	2018/05/07
+ * Version:	@(#)ui_main.c	1.0.11	2018/05/08
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -243,9 +243,7 @@ ui_menu_toggle_video_item(int idm, int *val)
 void
 ui_menu_reset_all(void)
 {
-#ifdef ENABLE_LOG_TOGGLES
     int i;
-#endif
 
 #ifndef DEV_BRANCH
     /* FIXME: until we fix these.. --FvK */