4 files changed, 7 insertions, 6 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 983b31116..f04ea5ced 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -394,7 +394,8 @@ static const uint16_t PRIMES[] ALIGN2 = { 251, 1021, 4093, 16381, 65521 };
 /* Globals. Split in two parts so that first one is addressed
  * with (mostly short) negative offsets */
 struct globals {
-        chain beginseq, mainseq, endseq, *seq;
+        chain beginseq, mainseq, endseq;
+        chain *seq;
         node *break_ptr, *continue_ptr;
         rstream *iF;
         xhash *vhash, *ahash, *fdhash, *fnhash;
@@ -445,7 +446,7 @@ struct globals2 {
         tsplitter fsplitter, rsplitter;
 };
 #define G1 (ptr_to_globals[-1])
-#define G (*(struct globals2 *const)ptr_to_globals)
+#define G (*(struct globals2 *)ptr_to_globals)
 /* For debug. nm --size-sort awk.o | grep -vi ' [tr] ' */
 /* char G1size[sizeof(G1)]; - 0x6c */
 /* char Gsize[sizeof(G)]; - 0x1cc */
@@ -485,7 +486,7 @@ struct globals2 {
 #define fsplitter    (G.fsplitter   )
 #define rsplitter    (G.rsplitter   )
 #define INIT_G() do { \
-        PTR_TO_GLOBALS = xzalloc(sizeof(G1) + sizeof(G)) + sizeof(G1); \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G1) + sizeof(G)) + sizeof(G1)); \
         G.next_token__ltclass = TC_OPTERM; \
         G.evaluate__seed = 1; \
 } while (0)
diff --git a/editors/diff.c b/editors/diff.c
index 64b7daa11..8844ec1c0 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -151,7 +151,7 @@ struct globals {
 #define stb1               (G.stb1              )
 #define stb2               (G.stb2              )
 #define INIT_G() do { \
-        PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
         context = 3; \
         max_context = 64; \
 } while (0)
diff --git a/editors/ed.c b/editors/ed.c
index a569788ad..15f0147be 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -51,7 +51,7 @@ struct globals {
 #define lines              (G.lines             )
 #define marks              (G.marks             )
 #define INIT_G() do { \
-        PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
 } while (0)
 
 
diff --git a/editors/vi.c b/editors/vi.c
index 6f4bd06f2..d2d267036 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -233,7 +233,7 @@ struct globals {
 #define readbuffer     (G.readbuffer    )
 #define scr_out_buf    (G.scr_out_buf   )
 #define INIT_G() do { \
-        PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
 } while (0)
 
 static int init_text_buffer(char *); // init from file or create new