luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove __attribute__, replace by __declspec

This commit is contained in:
Holger Vogt 2022-10-31 12:48:20 +01:00
parent 04f4ebc790
commit de9fa37aa9
1 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/osdi/osdidefs.h
View File

@ -16,14 +16,36 @@
#include "osdi.h" #include "osdi.h"
#include "osdiext.h" #include "osdiext.h"
#include "stddef.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
typedef struct OsdiModelData { #ifdef _MSC_VER
GENmodel gen; typedef struct {
max_align_t data; long long __max_align_ll ;
} OsdiModelData; long double __max_align_ld;
/* _Float128 is defined as a basic type, so max_align_t must be
sufficiently aligned for it. This code must work in C++, so we
use __float128 here; that is only available on some
architectures, but only on i386 is extra alignment needed for
__float128. */
#ifdef __i386__
__float128 __max_align_f128 __attribute__((__aligned__(__alignof(__float128))));
#endif
} max_align_t;
#endif
#ifdef _MSC_VER
#define MAX_ALIGN 8
#else
#define MAX_ALIGN sizeof(max_align_t)
#endif
#ifndef _MSC_VER
#define ALIGN(pow) __attribute__((aligned(pow)))
#else
#define ALIGN(pow) __declspec(align(pow))
#endif
typedef struct OsdiExtraInstData { typedef struct OsdiExtraInstData {
double dt; double dt;
@ -32,17 +54,22 @@ typedef struct OsdiExtraInstData {
bool dt_given; bool dt_given;
bool finish; bool finish;
} __attribute__((aligned(sizeof(max_align_t)))) OsdiExtraInstData; } ALIGN(MAX_ALIGN) OsdiExtraInstData;
size_t osdi_instance_data_off(const OsdiRegistryEntry *entry); typedef struct OsdiModelData {
void *osdi_instance_data(const OsdiRegistryEntry *entry, GENinstance *inst); GENmodel gen;
OsdiExtraInstData *osdi_extra_instance_data(const OsdiRegistryEntry *entry, max_align_t data;
} OsdiModelData;
extern size_t osdi_instance_data_off(const OsdiRegistryEntry *entry);
extern void *osdi_instance_data(const OsdiRegistryEntry *entry, GENinstance *inst);
extern OsdiExtraInstData *osdi_extra_instance_data(const OsdiRegistryEntry *entry,
GENinstance *inst); GENinstance *inst);
size_t osdi_model_data_off(void); extern size_t osdi_model_data_off(void);
void *osdi_model_data(GENmodel *model); extern void *osdi_model_data(GENmodel *model);
void *osdi_model_data_from_inst(GENinstance *inst); extern void *osdi_model_data_from_inst(GENinstance *inst);
OsdiRegistryEntry *osdi_reg_entry_model(const GENmodel *model); extern OsdiRegistryEntry *osdi_reg_entry_model(const GENmodel *model);
OsdiRegistryEntry *osdi_reg_entry_inst(const GENinstance *inst); extern OsdiRegistryEntry *osdi_reg_entry_inst(const GENinstance *inst);
typedef struct OsdiNgspiceHandle { typedef struct OsdiNgspiceHandle {
uint32_t kind; uint32_t kind;