win32: make the clang build less crashy

busybox-w32 binaries built using clang crashed so frequently that
they were pretty much unusable.  The main issue seems to be with
assignments to the structures containing global variables which
are used in most applets.

Upstream commit 5156b2455 (Make const ptr assign as function call
in clang) addresses this, but is insufficient for the build on
Windows.  Extend the idea to the ASSIGN_CONST_PTR() macro too.

Costs 32-80 bytes in the gcc build.

1 files changed, 2 insertions, 6 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 8b7c6c627..adab63fa7 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -17279,8 +17279,6 @@ forkshell_init(const char *idstr)
         struct forkshell *fs;
         void *map_handle;
         HANDLE h;
-        struct globals_var **gvpp;
-        struct globals_misc **gmpp;
         int i;
         char **ptr;
         char *lrelocate;
@@ -17323,10 +17321,8 @@ forkshell_init(const char *idstr)
         fs->gmp->trap_ptr = fs->gmp->trap;
 
         /* Set global variables */
-        gvpp = (struct globals_var **)&ash_ptr_to_globals_var;
-        *gvpp = fs->gvp;
-        gmpp = (struct globals_misc **)&ash_ptr_to_globals_misc;
-        *gmpp = fs->gmp;
+        ASSIGN_CONST_PTR(&ash_ptr_to_globals_var, fs->gvp);
+        ASSIGN_CONST_PTR(&ash_ptr_to_globals_misc, fs->gmp);
         cmdtable = fs->cmdtable;
 #if ENABLE_ASH_ALIAS
         atab = fs->atab;        /* will be NULL for FS_SHELLEXEC */