* *.c: Finish replacing K&R style prototypes with ANSI C

[bpt/guile.git] / libguile / snarf.h

diff --git a/libguile/snarf.h b/libguile/snarf.h
index 06baaf3..999ffe3 100644 (file)
--- a/libguile/snarf.h
+++ b/libguile/snarf.h
@@ -60,8 +60,6 @@ SCM FNAME ARGLIST
 static const char s_ ## FNAME [] = PRIMNAME; \
 SCM FNAME ARGLIST
 
-#define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN)  \
-       static const char RANAME[]=STR
 #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)  \
@@ -76,14 +74,17 @@ SCM FNAME ARGLIST
 #if defined(__cplusplus) || defined(GUILE_CPLUSPLUS_SNARF)
 
 #define GUILE_PROC(FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) \
-%%%     scm_make_gsubr (s_ ## FNAME, REQ, OPT, VAR, (SCM (*)(...)) FNAME);
+%%%     scm_make_gsubr (s_ ## FNAME, REQ, OPT, VAR, (SCM (*)(...)) FNAME); \
+$$$ primname #ARGLIST req opt var @@@ docstring @!!!
+
 #define GUILE_PROC1(FNAME, PRIMNAME, TYPE, ARGLIST, DOCSTRING) \
-%%%     scm_make_subr (s_ ## FNAME, TYPE, FNAME);
+%%%     scm_make_subr (s_ ## FNAME, TYPE, FNAME); \
+$$1 primname #ARGLIST type @@@ 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)
+%%%    scm_make_gsubr (RANAME, REQ, OPT, VAR, (SCM (*)(...)) CFN) \
+$$R RANAMEprimname #ARGLIST type @@@ docstring @!!!
+
 #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)  \