kotovalexarian-likes-gitlab/bztsrc--bootboot
1
0
Fork 0
mirror of https://gitlab.com/bztsrc/bootboot.git synced 2023-02-13 20:54:32 -05:00
Code Releases Activity

Added support for MSVC syntax

Browse source
This commit is contained in:
bzt 2021-05-07 13:03:18 +02:00
parent c4b073b307
commit befefb00a2
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dist/bootboot.h vendored
View file

@ -35,6 +35,13 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifndef _MSC_VER
#define _pack __attribute__((packed))
#else
#define _pack
#pragma pack(push)
#pragma pack(1)
#endif
#define BOOTBOOT_MAGIC "BOOT" #define BOOTBOOT_MAGIC "BOOT"
@ -75,7 +82,7 @@ extern "C" {
typedef struct { typedef struct {
uint64_t ptr; uint64_t ptr;
uint64_t size; uint64_t size;
} __attribute__((packed)) MMapEnt; } _pack MMapEnt;
#define MMapEnt_Ptr(a) (a->ptr) #define MMapEnt_Ptr(a) (a->ptr)
#define MMapEnt_Size(a) (a->size & 0xFFFFFFFFFFFFFFF0) #define MMapEnt_Size(a) (a->size & 0xFFFFFFFFFFFFFFF0)
#define MMapEnt_Type(a) (a->size & 0xF) #define MMapEnt_Type(a) (a->size & 0xF)
@ -135,8 +142,11 @@ typedef struct {
/* use like this: /* use like this:
* MMapEnt *mmap_ent = &bootboot.mmap; mmap_ent++; * MMapEnt *mmap_ent = &bootboot.mmap; mmap_ent++;
* until you reach bootboot->size */ * until you reach bootboot->size */
} __attribute__((packed)) BOOTBOOT; } _pack BOOTBOOT;
#ifdef _MSC_VER
#pragma pack(pop)
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }