Remove double underscore prefix from __packed and __aligned() definit…

…ions.

It is polluting the GCC namespace and breaks the build with GCC v9.

inc/config.h

@@ -9,7 +9,10 @@
  * See the file COPYING for more details, or visit <http://unlicense.org>.
  */
 
-enum dispen { DISPCTL_tristate = 0, DISPCTL_enable_high, DISPCTL_enable_low, DISPCTL_MAX };
+enum dispen { DISPCTL_tristate = 0,
+              DISPCTL_enable_high,
+              DISPCTL_enable_low,
+              DISPCTL_MAX };
 /* PB15 is tristate outside OSD; PA15 unused
  * PA15 is Display Enable: Active HIGH
  * PA15 is Display Enable: Active LOW */
@@ -18,7 +21,7 @@ enum timings { DISP_15KHZ=0, DISP_VGA, DISP_AUTO, DISP_MAX };
 
 enum polarities { SYNC_LOW=0, SYNC_HIGH, SYNC_AUTO, SYNC_MAX };
 
-extern struct __packed config {
+extern struct packed config {
 
     uint16_t polarity;
 
@@ -53,7 +56,7 @@ extern struct __packed config {
     /* Mask of user-assigned pins which are HIGH at power on. */
     uint8_t user_pin_high;
     uint8_t _pad;
-    struct __packed config_hotkey {
+    struct packed config_hotkey {
         /* Mask of user pins modified by this hotkey. */
         uint8_t pin_mod;
         /* Mask of user pins driven HIGH by this hotkey. 

inc/intrinsics.h

@@ -19,8 +19,8 @@ struct exception_frame {
 /* Force a compilation error if condition is true */
 #define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); })
 
-#define __aligned(x) __attribute__((aligned(x)))
-#define __packed __attribute((packed))
+#define aligned(x) __attribute__((aligned(x)))
+#define packed __attribute((packed))
 #define always_inline __inline__ __attribute__((always_inline))
 #define noinline __attribute__((noinline))
 

inc/util.h

@@ -138,7 +138,7 @@ void i2c_process(void);
 extern struct display i2c_display;
 extern bool_t i2c_osd_protocol;
 extern uint8_t i2c_buttons_rx; /* Gotek -> FF_OSD */
-extern struct __packed i2c_osd_info {
+extern struct packed i2c_osd_info {
     uint8_t protocol_ver;
     uint8_t fw_major, fw_minor;
     uint8_t buttons;