Version 2.0 - Simplify usage

ExoSkye · Apr 14, 2023 · 04b9459 · 04b9459
1 parent 97dc82f
commit 04b9459
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -17,14 +17,12 @@ TL;DR: Don't use this is in a public interface for a library (ie. the installed
 
 // Packed struct
 
-PACKED_STRUCT(
-    a {
-        int a;
-        char b;
-        short c;
-        int d;
-    }
-);
+packed_struct a {
+    int a;
+    char b;
+    short c;
+    int d;
+};
 
 // Non-packed struct
 struct b {
@@ -41,7 +39,7 @@ This is the same for C++, however, you'd use `sizeof(a)` instead of `sizeof(stru
 
 You only need to copy `packed.h` into your project, all other files aren't essential. (`main.c` and `main.cpp` are just used for testing).
 
-This library is also compatible with the widely used `typedef struct x {} x;` pattern used in C, you just need to replace `struct x {}` in that example with `PACKED_STRUCT(x {})`.
+This library is also compatible with the widely used `typedef struct x {} x;` pattern used in C, you just need to replace `struct x {}` in that example with `packed_struct x {}`.
 
 ## Compiler Support
 

diff --git a/main.c b/main.c
@@ -1,14 +1,12 @@
 #include "packed.h"
 #include <stdio.h>
 
-typedef PACKED_STRUCT(
-        a {
+typedef packed_struct a {
             int a;
             char b;
             short c;
             int d;
-        }
-    ) a;
+        } a;
 
 int main() {
 

diff --git a/main.cpp b/main.cpp
@@ -2,14 +2,12 @@
 #include <cstdio>
 
 int main() {
-    PACKED_STRUCT(
-        a {
+    packed_struct a {
             int a;
             char b;
             short c;
             int d;
-        }
-    );
+        };
 
     struct b {
         int a;

diff --git a/packed.h b/packed.h
@@ -26,26 +26,26 @@
 
 
 #ifdef __GNUC__
-    #define PACKED_OUTER(KEYWORD, ...) KEYWORD __attribute__((packed)) __VA_ARGS__
+    #define PACKED_OUTER(KEYWORD) KEYWORD __attribute__((packed))
 #elif defined(_MSC_VER)
-    #define PACKED_OUTER(KEYWORD, ...) __pragma( pack(push, 1) ) KEYWORD __VA_ARGS__ __pragma( pack(pop))
+    #define PACKED_OUTER(KEYWORD) __pragma(pack()) KEYWORD 
 #elif defined(__clang__)
-    #define PACKED_OUTER(KEYWORD, ...) KEYWORD __attribute__((packed)) __VA_ARGS__
+    #define PACKED_OUTER(KEYWORD) KEYWORD __attribute__((packed))
 #elif defined(__CC65__)
     #warning This compiler (CC65) does not support packed structs
-    #define PACKED_OUTER(KEYWORD, ...) KEYWORD __VA_ARGS__
+    #define PACKED_OUTER(KEYWORD) KEYWORD
 #elif defined(__SDCC)
     #warning This compiler (SDCC) does not support packed structs
-    #define PACKED_OUTER(KEYWORD, ...) KEYWORD __VA_ARGS__
+    #define PACKED_OUTER(KEYWORD) KEYWORD
 #elif defined(__TINYC__)
-    #define PACKED_OUTER(KEYWORD, ...) KEYWORD __attribute__((packed)) __VA_ARGS__
+    #define PACKED_OUTER(KEYWORD) KEYWORD __attribute__((packed))
 #else
     #ifndef UNSUPPORTED_COMPILER_WARNING
         #define UNSUPPORTED_COMPILER_WARNING
         #warning This library does not currently have support for your compiler, consider submitting a pull-request for it?
-        #define PACKED_OUTER(__decl__) KEYWORD __VA_ARGS__
+        #define PACKED_OUTER(__decl__) KEYWORD
     #endif
 #endif
 
-#define PACKED_STRUCT(...) PACKED_OUTER(struct, __VA_ARGS__)
-#define PACKED_ENUM(...) PACKED_OUTER(enum, __VA_ARGS__)
+#define packed_struct PACKED_OUTER(struct)
+#define packed_enum PACKED_OUTER(enum)