Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

1 files changed, 0 insertions, 6 deletions

diff --git a/src/w32.c b/src/w32.c
index 7a39a617ee3..230479cd61a 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3785,12 +3785,6 @@ get_rid (PSID sid)
 
 /* Caching SID and account values for faster lokup.  */
 
-#ifdef __GNUC__
-# define FLEXIBLE_ARRAY_MEMBER
-#else
-# define FLEXIBLE_ARRAY_MEMBER 1
-#endif
-
 struct w32_id {
   unsigned rid;
   struct w32_id *next;