diff options
-rw-r--r-- | scripts/minimaws/lib/wsgiserve.py | 8 | ||||
-rw-r--r-- | src/devices/cpu/m6805/m68hc05e1.cpp | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/minimaws/lib/wsgiserve.py b/scripts/minimaws/lib/wsgiserve.py index 1158528d954..28afa75d1f2 100644 --- a/scripts/minimaws/lib/wsgiserve.py +++ b/scripts/minimaws/lib/wsgiserve.py @@ -6,7 +6,6 @@ from . import dbaccess from . import htmltmpl -import cgi import inspect import json import mimetypes @@ -16,11 +15,12 @@ import sys import urllib import wsgiref.util -if hasattr(cgi, 'escape'): - htmlescape = cgi.escape -else: +try: import html htmlescape = html.escape +except ImportError: + import cgi + htmlescape = cgi.escape try: import urllib.parse as urlparse diff --git a/src/devices/cpu/m6805/m68hc05e1.cpp b/src/devices/cpu/m6805/m68hc05e1.cpp index 75105f54bf0..b4a220c0d08 100644 --- a/src/devices/cpu/m6805/m68hc05e1.cpp +++ b/src/devices/cpu/m6805/m68hc05e1.cpp @@ -6,6 +6,7 @@ #include "emu.h" #include "m68hc05e1.h" +#include "m6805defs.h" #include "6805dasm.h" #define VERBOSE (0) |