2 files changed, 17 insertions, 12 deletions

diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c
index 2464357c1..c16f9e087 100644
--- a/libbb/find_mount_point.c
+++ b/libbb/find_mount_point.c
@@ -22,12 +22,13 @@
 struct mntent* FAST_FUNC find_mount_point(const char *name, int subdir_too)
 {
         struct stat s;
-        struct mntent *mountEntry;
 #if !ENABLE_PLATFORM_MINGW32
         FILE *mtab_fp;
+        struct mntent *mountEntry;
         dev_t devno_of_name;
         bool block_dev;
 #else
+        struct mntent *mountEntry;
         static struct mntdata *data = NULL;
         char *current;
         const char *path;
diff --git a/shell/ash.c b/shell/ash.c
index 712286fbd..8b8c5f1dc 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -349,8 +349,9 @@ typedef long arith_t;
 # define BB_GLOBAL_CONST const
 #endif
 
-#define FORKSHELL_DEBUG 0
 #if ENABLE_PLATFORM_MINGW32
+# define FORKSHELL_DEBUG 0
+
 union node;
 struct strlist;
 struct job;
@@ -9660,17 +9661,20 @@ nodeckstrdup(const char *s)
 
 static union node *copynode(union node *);
 
-#if ENABLE_PLATFORM_MINGW32 && FORKSHELL_DEBUG
-# define FREE 1
-# define NO_FREE 2
-# define ANNOT(dst,note) {if (annot) annot[(char *)&dst - (char *)fs_start] = note;}
-#else
-# define FREE 1
-# define NO_FREE 1
-# define ANNOT(dst,note)
-#endif
-
 #if ENABLE_PLATFORM_MINGW32
+# if FORKSHELL_DEBUG
+#  define FREE 1
+#  define NO_FREE 2
+#  define ANNOT(dst,note) { \
+                if (annot) \
+                        annot[(char *)&dst - (char *)fs_start] = note; \
+        }
+# else
+#  define FREE 1
+#  define NO_FREE 1
+#  define ANNOT(dst,note)
+# endif
+
 /* The relocation map is offset from the start of the forkshell data
  * block by 'fs_size' bytes.  The flag relating to a particular destination
  * pointer is thus at (dst+fs_size). */