diff options
| author | June McEnroe <june@causal.agency> | 2018-08-21 15:38:38 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2018-08-21 15:38:38 -0400 |
| commit | a2353335a28e5b3d185a2dfbe5380f134fe59725 (patch) | |
| tree | dc7167ae304da52439af6e0a5c0af500751321db | |
| parent | Shrink the torus and rearrange struct Tile (diff) | |
| download | torus-a2353335a28e5b3d185a2dfbe5380f134fe59725.tar.gz torus-a2353335a28e5b3d185a2dfbe5380f134fe59725.zip | |
Use alignas rather than attributes
| -rw-r--r-- | torus.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/torus.h b/torus.h index 9c047b9..775670c 100644 --- a/torus.h +++ b/torus.h @@ -15,15 +15,13 @@ */ #include <assert.h> +#include <stdalign.h> #include <stdbool.h> #include <stddef.h> #include <stdint.h> #include <stdlib.h> #include <time.h> -#define PACKED __attribute__((packed)) -#define ALIGNED(x) __attribute__((aligned(x))) - #define ARRAY_LEN(a) (sizeof(a) / sizeof((a)[0])) #undef COLOR_BLACK @@ -64,8 +62,8 @@ struct Meta { uint32_t accessCount; }; -struct ALIGNED(4096) Tile { - char cells[CELL_ROWS][CELL_COLS]; +struct Tile { + alignas(4096) char cells[CELL_ROWS][CELL_COLS]; uint8_t colors[CELL_ROWS][CELL_COLS]; struct Meta meta; }; @@ -90,7 +88,7 @@ struct Map { }; struct ServerMessage { - enum PACKED { + enum { SERVER_TILE, SERVER_MOVE, SERVER_PUT, @@ -120,7 +118,7 @@ struct ServerMessage { static const uint8_t CURSOR_NONE = UINT8_MAX; struct ClientMessage { - enum PACKED { + enum { CLIENT_MOVE, CLIENT_PUT, CLIENT_MAP, |