5 files changed, 12 insertions, 14 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 60d4146712..650606ff8b 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -334,6 +334,6 @@ def get_ndk_version(path):
                 key_value = list(map(lambda x: x.strip(), line.split("=")))
                 if key_value[0] == "Pkg.Revision":
                     return key_value[1]
-    except:
+    except Exception:
         print("Could not read source prop file '%s'" % prop_file_path)
     return None
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py
index 193a5ca4df..d53c774e77 100644
--- a/platform/javascript/detect.py
+++ b/platform/javascript/detect.py
@@ -50,9 +50,7 @@ def get_flags():
 
 
 def configure(env):
-    try:
-        env["initial_memory"] = int(env["initial_memory"])
-    except:
+    if not isinstance(env["initial_memory"], int):
         print("Initial memory must be a valid integer")
         sys.exit(255)
 
diff --git a/platform/linuxbsd/display_server_x11.cpp b/platform/linuxbsd/display_server_x11.cpp
index 136bee68e3..7e58272208 100644
--- a/platform/linuxbsd/display_server_x11.cpp
+++ b/platform/linuxbsd/display_server_x11.cpp
@@ -95,6 +95,15 @@
 static const double abs_resolution_mult = 10000.0;
 static const double abs_resolution_range_mult = 10.0;
 
+// Hints for X11 fullscreen
+struct Hints {
+	unsigned long flags = 0;
+	unsigned long functions = 0;
+	unsigned long decorations = 0;
+	long inputMode = 0;
+	unsigned long status = 0;
+};
+
 bool DisplayServerX11::has_feature(Feature p_feature) const {
 	switch (p_feature) {
 		case FEATURE_SUBWINDOWS:
diff --git a/platform/linuxbsd/display_server_x11.h b/platform/linuxbsd/display_server_x11.h
index 0507ef3fff..6f437f3be9 100644
--- a/platform/linuxbsd/display_server_x11.h
+++ b/platform/linuxbsd/display_server_x11.h
@@ -61,15 +61,6 @@
 #include <X11/extensions/Xrandr.h>
 #include <X11/keysym.h>
 
-// Hints for X11 fullscreen
-typedef struct {
-	unsigned long flags = 0;
-	unsigned long functions = 0;
-	unsigned long decorations = 0;
-	long inputMode = 0;
-	unsigned long status = 0;
-} Hints;
-
 typedef struct _xrr_monitor_info {
 	Atom name;
 	Bool primary = false;
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index ee13e3c774..859051ede9 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -95,7 +95,7 @@ def build_res_file(target, source, env):
             out = subprocess.Popen(cmd, shell=True, stderr=subprocess.PIPE).communicate()
             if len(out[1]):
                 return 1
-        except:
+        except Exception:
             return 1
     return 0