diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dd280ec..c95cb76 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-11  Tom Tromey  <tromey@adacore.com>
+
+	* psympriv.h (partial_symbol): Don't static assert on Windows.
+	* symtab.h (general_symbol_info, symbol): Don't static assert on
+	Windows.
+
 2019-11-10  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* python/py-symbol.c (gdbpy_lookup_static_symbols): New
diff --git a/gdb/psympriv.h b/gdb/psympriv.h
index c81261a..80f2a1a 100644
--- a/gdb/psympriv.h
+++ b/gdb/psympriv.h
@@ -82,11 +82,15 @@
   ENUM_BITFIELD(address_class) aclass : SYMBOL_ACLASS_BITS;
 };
 
+/* The Windows ABI requires this structure to be packed
+   differently.  */
+#ifndef _WIN32
 /* This struct is size-critical (see comment at the to of symtab.h), so this
    assert makes sure the size doesn't change accidentally.  Be careful when
    purposely increasing the size.  */
 gdb_static_assert ((sizeof (void *) == 8 && sizeof (partial_symbol) == 40)
 		   || (sizeof (void *) == 4 && sizeof (partial_symbol) == 24));
+#endif
 
 /* A convenience enum to give names to some constants used when
    searching psymtabs.  This is internal to psymtab and should not be
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 111a0f9..3aa4c45 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -446,12 +446,16 @@
   short section;
 };
 
+/* The Windows ABI requires this structure to be packed
+   differently.  */
+#ifndef _WIN32
 /* This struct is size-critical (see comment at the top), so this assert
    makes sure the size doesn't change accidentally.  Be careful when
    purposely increasing the size.  */
 gdb_static_assert ((sizeof (void *) == 8 && sizeof (general_symbol_info) == 32)
 		   || (sizeof (void *) == 4
 		       && sizeof (general_symbol_info) == 20));
+#endif
 
 extern void symbol_set_demangled_name (struct general_symbol_info *,
 				       const char *,
@@ -1194,11 +1198,15 @@
   struct symbol *hash_next;
 };
 
+/* The Windows ABI requires this structure to be packed
+   differently.  */
+#ifndef _WIN32
 /* This struct is size-critical (see comment at the top), so this assert
    makes sure the size doesn't change accidentally.  Be careful when
    purposely increasing the size.  */
 gdb_static_assert ((sizeof (void *) == 8 && sizeof (symbol) == 72)
 		   || (sizeof (void *) == 4 && sizeof (symbol) == 40));
+#endif
 
 /* Several lookup functions return both a symbol and the block in which the
    symbol is found.  This structure is used in these cases.  */