diff --git a/src/gui_w32.c b/src/gui_w32.c
index c5d1eb0..c49d82b 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -2522,8 +2522,7 @@
 
 #define add_string(s) strcpy((LPSTR)p, s); (LPSTR)p += (strlen((LPSTR)p) + 1)
 #define add_word(x)		*p++ = (x)
-#define add_byte(x)		*((LPSTR)p)++ = (x)
-#define add_long(x)		*((LPDWORD)p)++ = (x)
+#define add_long(x)		dwp = (DWORD *)p; *dwp++ = (x); p = (WORD *)dwp
 
 #if defined(FEAT_GUI_DIALOG) || defined(PROTO)
 /*
@@ -2650,6 +2649,7 @@
     char_u	*textfield)
 {
     WORD	*p, *pdlgtemplate, *pnumitems;
+    DWORD	*dwp;
     int		numButtons;
     int		*buttonWidths, *buttonPositions;
     int		buttonYpos;