rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Put alignment on segment fields. Work with MSVC

Browse source
This commit is contained in:
Jonah Beckford 2023-05-09 18:22:57 -07:00
parent 632f0d73a1
commit 01657913b2
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/capnp_c.h
View file

@ -13,7 +13,9 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#ifndef _MSC_VER
#include <unistd.h> #include <unistd.h>
#endif
#if defined(unix) && !defined(__APPLE__) && !defined(__FreeBSD__) #if defined(unix) && !defined(__APPLE__) && !defined(__FreeBSD__)
#include <endian.h> #include <endian.h>
@ -30,7 +32,13 @@ typedef intmax_t ssize_t;
#include <stddef.h> #include <stddef.h>
#endif #endif
// Cross-platform macro ALIGNED_(x) aligns a struct by `x` bytes. /* Cross-platform macro ALIGNED_(x) aligns a struct or a field
* by `x` bytes. When applied to a struct, it applies to the
* aggregate but not the individual members of the struct. So
* apply ALIGNED_(x) to individual members that need to be
* aligned.
* Confer: https://www.ibm.com/docs/en/i/7.1?topic=attributes-aligned-type-attribute
*/
#ifdef _MSC_VER #ifdef _MSC_VER
#define ALIGNED_(x) __declspec(align(x)) #define ALIGNED_(x) __declspec(align(x))
#endif #endif
@ -115,7 +123,7 @@ struct capn_tree *capn_tree_insert(struct capn_tree *root, struct capn_tree *n);
* one by incrementing cap and returning the expanded segment. * one by incrementing cap and returning the expanded segment.
* *
* data, len, and cap must all be 8 byte aligned, hence the ALIGNED_(8) macro * data, len, and cap must all be 8 byte aligned, hence the ALIGNED_(8) macro
* on the struct definition. * on the struct fields.
* *
* data, len, cap, and user should all be set by the user. Other values * data, len, cap, and user should all be set by the user. Other values
* should be zero initialized. * should be zero initialized.
@ -127,9 +135,10 @@ struct ALIGNED_(8) capn_segment {
struct capn *capn; struct capn *capn;
uint32_t id; uint32_t id;
/* user settable */ /* user settable */
char *data; ALIGNED_(8) char *data;
size_t len, cap; ALIGNED_(8) size_t len;
void *user; ALIGNED_(8) size_t cap;
ALIGNED_(8) void *user;
}; };
enum CAPN_TYPE { enum CAPN_TYPE {