Skip to content

Commit f7953a8

Browse files
committed
update prototype definition for gcc-15
1 parent b012e8e commit f7953a8

File tree

7 files changed

+17
-19
lines changed

7 files changed

+17
-19
lines changed

irteus/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ all: defun.h $(LIBNR) $(LIBIRTEUS) $(LIBIRTEUSG) $(LIBIRTEUSX) $(LIBIRTEUSIMG) $
159159

160160
.PHONY: defun.h
161161
defun.h:
162-
echo '#include "eus.h"\n#undef defun\npointer TEST();\nvoid test(void) {register context *ctx; pointer mod; defun(ctx,"TEST",mod,TEST,NULL);}' > test.c
162+
echo '#include "eus.h"\n#undef defun\npointer TEST();\nvoid test(void) {register context *ctx; pointer mod; defun((context *)ctx,(char *)"TEST",(pointer)mod,(pointer(*)(context*,int,pointer*))TEST,(char *)NULL);}' > test.c
163163
echo "// redefine defun for update defun() API () https://github.com/euslisp/EusLisp/pull/116" > defun.h
164164
echo "#undef defun" >> defun.h
165165
$(CC) $(CFLAGS) $(WFLAGS) -c test.c $(OBJOPT) test.o || echo "#define defun(a, b, c, d, e) defun(a, b, c, d) // for EusLisp < 9.24" >> defun.h

irteus/eusbullet.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545

4646
#include "eus.h"
4747

48-
extern pointer ___eusbullet();
48+
extern pointer ___eusbullet(context*,int,pointer*);
4949
static void register_eusbullet()
50-
{ add_module_initializer("___eusbullet", ___eusbullet);}
50+
{ add_module_initializer("___eusbullet", (pointer (*)(context*,int,pointer*))___eusbullet);}
5151

5252
extern eusinteger_t C_BT_MakeSphereModel(eusfloat_t r);
5353
extern eusinteger_t C_BT_MakeBoxModel(eusfloat_t xsize, eusfloat_t ysize, eusfloat_t zsize);

irteus/euspng.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
#include <png.h>
4747
#include "eus.h"
4848

49-
extern pointer ___euspng();
49+
extern pointer ___euspng(context*,int,pointer*);
5050
static void register_euspng()
51-
{ add_module_initializer("___euspng", ___euspng);}
51+
{ add_module_initializer("___euspng", (pointer (*)(context*,int,pointer*))___euspng);}
5252

5353
pointer PNG_READ_IMAGE(register context *ctx, int n, register pointer *argv)
5454
{

irteus/euspqp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545

4646
#include "eus.h"
4747

48-
extern pointer ___euspqp();
48+
extern pointer ___euspqp(context*,int,pointer*);
4949
static void register_euspqp()
50-
{ add_module_initializer("___euspqp", ___euspqp);}
50+
{ add_module_initializer("___euspqp", (pointer (*)(context*,int,pointer*))___euspqp);}
5151

5252
extern eusinteger_t PQP_MakeModel();
5353
extern void PQP_DeleteModel(eusinteger_t m);

irteus/irtc.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
#include "eus.h"
4545
#include "nr.h"
4646
#include <math.h>
47-
extern pointer ___irtc();
47+
extern pointer ___irtc(context*,int,pointer*);
4848
static void register_irtc()
49-
{ add_module_initializer("___irtc", ___irtc);}
49+
{ add_module_initializer("___irtc", (pointer (*)(context*,int,pointer*))___irtc);}
5050

5151
#define colsize(p) (intval(p->c.ary.dim[1]))
5252
#define rowsize(p) (intval(p->c.ary.dim[0]))
@@ -1029,11 +1029,10 @@ register pointer *argv;
10291029
}
10301030

10311031
#include "defun.h" // redefine defun for update defun() API
1032-
pointer ___irtc(ctx,n,argv, env)
1032+
pointer ___irtc(ctx,n,argv)
10331033
register context *ctx;
10341034
int n;
10351035
pointer argv[];
1036-
pointer env;
10371036
{
10381037
pointer mod=argv[0];
10391038
defun(ctx,"ROTM3*",mod,MATTIMES3,NULL);

irteus/irtgeoc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#include "eus.h"
33
#include <math.h>
44

5-
extern pointer ___irtgeoc();
5+
extern pointer ___irtgeoc(context*,int,pointer*);
66
static void register_irtgeoc()
7-
{ add_module_initializer("___irtgeoc", ___irtgeoc);}
7+
{ add_module_initializer("___irtgeoc", (pointer (*)(context*,int,pointer*))___irtgeoc);}
88

99
//
1010
//
@@ -355,8 +355,8 @@ pointer C_ISNAN (ctx,n,argv)
355355
}
356356

357357
#include "defun.h" // redefine defun for update defun() API
358-
pointer ___irtgeoc(ctx,n, argv, env)
359-
register context *ctx;int n;pointer *argv;pointer env;
358+
pointer ___irtgeoc(ctx,n, argv)
359+
register context *ctx;int n;pointer *argv;
360360
{
361361
defun(ctx,"C-COORDS-TRANSFORM-VECTOR",argv[0],C_COORDS_TRNSFORM_VECTOR,NULL);
362362
defun(ctx,"C-MATRIX-ROW",argv[0],C_MATRIX_ROW,NULL);

irteus/irtglc.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646

4747
#include "eus.h"
4848

49-
extern pointer ___irtglc();
49+
extern pointer ___irtglc(context*,int,pointer*);
5050
static void register_irtglc()
51-
{ add_module_initializer("___irtglc", ___irtglc);}
51+
{ add_module_initializer("___irtglc", (pointer (*)(context*,int,pointer*))___irtglc);}
5252

5353
#define colsize(p) (intval(p->c.ary.dim[1]))
5454
#define rowsize(p) (intval(p->c.ary.dim[0]))
@@ -89,11 +89,10 @@ pointer CTRANSPOSE_IMAGE_ROWS(ctx,n,argv)
8989
return((pointer)dst);}}
9090

9191
#include "defun.h" // redefine defun for update defun() API
92-
pointer ___irtglc(ctx,n,argv,env)
92+
pointer ___irtglc(ctx,n,argv)
9393
register context *ctx;
9494
int n;
9595
pointer argv[];
96-
pointer env;
9796
{
9897
pointer mod=argv[0];
9998
defun(ctx,"CTRANSPOSE-IMAGE-ROWS",mod,CTRANSPOSE_IMAGE_ROWS,NULL);

0 commit comments

Comments
 (0)