Fix generators & run regen

Author: encukou

Include/pymacro.h

@@ -38,7 +38,8 @@
 #ifdef Py_GIL_DISABLED
 #   ifndef _Py_ALIGN_AS
 #       ifdef __cplusplus
-#           if (__cplusplus < 201103L) && (defined(__GNUC__) || defined(__clang__)
+#           if (__cplusplus < 201103L) \
+                  && (defined(__GNUC__) || defined(__clang__))
 #               define _Py_ALIGN_AS(V) __attribute__((aligned(V)))
 #           else
 #               define _Py_ALIGN_AS(V) alignas(V)

Programs/test_frozenmain.h

@@ -204,9 +204,9 @@ def generate_unicode(self, name: str, s: str) -> str:
         with self.indent():
             with self.block("struct"):
                 if ascii:
-                    self.write("PyASCIIObject _ascii;")
+                    self.write("_PyASCIIObject _ascii;")
                 else:
-                    self.write("PyCompactUnicodeObject _compact;")
+                    self.write("_PyCompactUnicodeObject _compact;")
                 self.write(f"{datatype} _data[{len(s)+1}];")
         with self.block(f"{name} =", ";"):
             if ascii:

Tools/build/deepfreeze.py

@@ -264,10 +264,10 @@ def generate_global_strings(identifiers, strings):
                     assert name.isidentifier(), name
                     printer.write(f'STRUCT_FOR_ID({name})')
             with printer.block('struct', ' ascii[128];'):
-                printer.write("PyASCIIObject _ascii;")
+                printer.write("_PyASCIIObject _ascii;")
                 printer.write("uint8_t _data[2];")
             with printer.block('struct', ' latin1[128];'):
-                printer.write("PyCompactUnicodeObject _latin1;")
+                printer.write("_PyCompactUnicodeObject _latin1;")
                 printer.write("uint8_t _data[2];")
         printer.write(END)
         printer.write(after)