From 9b1594fd1940b4073a386d0c85bfe82cd672f132 Mon Sep 17 00:00:00 2001 From: "Greg J. Badros" Date: Tue, 14 Dec 1999 18:54:31 +0000 Subject: [PATCH] * snarf.h: Put SCM_PROC and SCM_PROC1 back in for backward-compatibility of packages that use Guile. Internally Guile should not use them, though. (Maybe enforce this with a new -DBUILDING_GUILE compile-time flag?). --- libguile/snarf.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libguile/snarf.h b/libguile/snarf.h index dfc931e9e..fce816b45 100644 --- a/libguile/snarf.h +++ b/libguile/snarf.h @@ -62,9 +62,14 @@ SCM FNAME ARGLIST #define SCM_REGISTER_PROC(RANAME, STR, REQ, OPT, VAR, CFN) \ static const char RANAME[]=STR + #define SCM_GPROC(RANAME, STR, REQ, OPT, VAR, CFN, GF) \ static const char RANAME[]=STR; \ static SCM GF = 0 + +#define SCM_PROC1(RANAME, STR, TYPE, CFN) \ + static const char RANAME[]=STR + #define SCM_GPROC1(RANAME, STR, TYPE, CFN, GF) \ static const char RANAME[]=STR; \ static SCM GF = 0 @@ -87,6 +92,9 @@ $$$R STR | REQ | OPT | VAR | __FILE__:__LINE__ | @@@ CFN @!!! #define SCM_GPROC(RANAME, STR, REQ, OPT, VAR, CFN, GF) \ %%% scm_make_gsubr_with_generic (RANAME, REQ, OPT, VAR, (SCM (*)(...))CFN, &GF) +#define SCM_PROC1(RANAME, STR, TYPE, CFN) \ +%%% scm_make_subr(RANAME, TYPE, (SCM (*)(...))CFN) + #define SCM_GPROC1(RANAME, STR, TYPE, CFN, GF) \ %%% scm_make_subr_with_generic(RANAME, TYPE, (SCM (*)(...))CFN, &GF) @@ -101,6 +109,9 @@ $$$P PRIMNAME #ARGLIST | REQ | OPT | VAR | __FILE__:__LINE__ | @@@ DOCSTRING @!! %%% scm_make_subr (s_ ## FNAME, TYPE, FNAME); \ $$$1 PRIMNAME #ARGLIST | 2 | 0 | 0 | __FILE__:__LINE__ | @@@ DOCSTRING @!!! +#define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN) \ +%%% scm_make_gsubr (RANAME, REQ, OPT, VAR, (SCM (*)()) CFN) + #define SCM_REGISTER_PROC(RANAME, STR, REQ, OPT, VAR, CFN) \ %%% scm_make_gsubr (RANAME, REQ, OPT, VAR, (SCM (*)()) CFN); \ $$$R STR | REQ | OPT | VAR | __FILE__:__LINE__ | @@@ CFN @!!! @@ -108,8 +119,12 @@ $$$R STR | REQ | OPT | VAR | __FILE__:__LINE__ | @@@ CFN @!!! #define SCM_GPROC(RANAME, STR, REQ, OPT, VAR, CFN, GF) \ %%% scm_make_gsubr_with_generic (RANAME, REQ, OPT, VAR, (SCM (*)()) CFN, &GF) +#define SCM_PROC1(RANAME, STR, TYPE, CFN) \ +%%% scm_make_subr(RANAME, TYPE, CFN) + #define SCM_GPROC1(RANAME, STR, TYPE, CFN, GF) \ %%% scm_make_subr_with_generic(RANAME, TYPE, CFN, &GF) + #endif #endif