outitf.c not remade, as alraedy o.k.
This commit is contained in:
Holger Vogt 2026-07-22 15:11:29 +02:00
parent 262781618a
commit 6acf1250d8
4 changed files with 11 additions and 7 deletions

View File

@ -23,6 +23,7 @@ static int gen_Input(REQUEST *request, RESPONSE *response);
static int nop(void);
#define NOP ((void *)nop)
static int nodev(void);
#undef NODEV /* the macOS SDK <sys/param.h> defines an unrelated NODEV */
#define NODEV ((void *)nodev)
#ifndef X_DISPLAY_MISSING

View File

@ -904,7 +904,7 @@ MarkowitzProducts(MatrixPtr Matrix, int Step)
if ((*pMarkowitzRow > LARGEST_SHORT_INTEGER && *pMarkowitzCol != 0) ||
(*pMarkowitzCol > LARGEST_SHORT_INTEGER && *pMarkowitzRow != 0)) {
fProduct = (double)(*pMarkowitzRow++) * (double)(*pMarkowitzCol++);
if (fProduct >= LARGEST_LONG_INTEGER)
if (fProduct >= (double)LARGEST_LONG_INTEGER)
*pMarkowitzProduct++ = LARGEST_LONG_INTEGER;
else
*pMarkowitzProduct++ = (long)fProduct;
@ -2751,7 +2751,7 @@ UpdateMarkowitzNumbers( MatrixPtr Matrix, ElementPtr pPivot )
if ((MarkoRow[Row] > LARGEST_SHORT_INTEGER && MarkoCol[Row] != 0) ||
(MarkoCol[Row] > LARGEST_SHORT_INTEGER && MarkoRow[Row] != 0)) {
Product = MarkoCol[Row] * MarkoRow[Row];
if (Product >= LARGEST_LONG_INTEGER)
if (Product >= (double)LARGEST_LONG_INTEGER)
Matrix->MarkowitzProd[Row] = LARGEST_LONG_INTEGER;
else
Matrix->MarkowitzProd[Row] = (long)Product;
@ -2770,7 +2770,7 @@ UpdateMarkowitzNumbers( MatrixPtr Matrix, ElementPtr pPivot )
if ((MarkoRow[Col] > LARGEST_SHORT_INTEGER && MarkoCol[Col] != 0) ||
(MarkoCol[Col] > LARGEST_SHORT_INTEGER && MarkoRow[Col] != 0)) {
Product = MarkoCol[Col] * MarkoRow[Col];
if (Product >= LARGEST_LONG_INTEGER)
if (Product >= (double)LARGEST_LONG_INTEGER)
Matrix->MarkowitzProd[Col] = LARGEST_LONG_INTEGER;
else
Matrix->MarkowitzProd[Col] = (long)Product;

View File

@ -52,10 +52,11 @@ typedef struct {
#endif
/* named OSDI_ALIGN: plain ALIGN collides with the macOS SDK <sys/param.h> */
#ifndef _MSC_VER
#define ALIGN(pow) __attribute__((aligned(pow)))
#define OSDI_ALIGN(pow) __attribute__((aligned(pow)))
#else
#define ALIGN(pow) __declspec(align(pow))
#define OSDI_ALIGN(pow) __declspec(align(pow))
#endif
typedef struct OsdiExtraInstData {
@ -65,7 +66,7 @@ typedef struct OsdiExtraInstData {
bool dt_given;
uint32_t eval_flags;
} ALIGN(MAX_ALIGN) OsdiExtraInstData;
} OSDI_ALIGN(MAX_ALIGN) OsdiExtraInstData;
typedef struct OsdiModelData {
GENmodel gen;

View File

@ -52,7 +52,9 @@ ifeq ($(ISMINGW), 1)
LDFLAGS = -shared @LDFLAGS@
endif
ifeq "$(strip $(uname))" "Darwin"
LDFLAGS = -bundle -flat_namespace -undefined suppress
# -flat_namespace/-undefined suppress are deprecated by the modern macOS
# linker; dynamic_lookup resolves the codemodels' ngspice symbols at load
LDFLAGS = -bundle -undefined dynamic_lookup
endif
ifeq "$(strip $(uname))" "SunOS"
ifneq "$(CC)" "gcc"