Re: C++, guile-snarf, and guile-1.3

[Jim Blandy <jimb@red-bean.com>]

Actually, that patch probably won't apply, because I used X
cut-and-paste to get it into the buffer, and tab characters were
expanded.  Arghthhtpt.

Rather:



1998-10-24  Jim Blandy  <jimb@zwingli.cygnus.com>

	Bug reports from Russ McManus:
	* guile-snarf.in: If the CPP environment variable is set, use that
	as the C preprocessor, instead of the preprocessor autoconf
	found.
	* snarf.h (SCM_PROC): Cast the function pointer passed to
	scm_make_gsubr, to satisfy C++.

Index: guile-snarf.in
===================================================================
RCS file: /egcs/carton/cvsfiles/guile/guile-core/libguile/guile-snarf.in,v
retrieving revision 1.3
diff -c -c -r1.3 guile-snarf.in
*** guile-snarf.in	1997/12/03 17:30:39	1.3
--- guile-snarf.in	1998/10/25 03:09:01
***************
*** 1,4 ****
  #!/bin/sh
  # Extract the initialization actions for builtin things.
  
! @CPP@ -DSCM_MAGIC_SNARFER "$@" | grep "^ *% *% *%" | sed -e "s/^ *% *% *%//"
--- 1,6 ----
  #!/bin/sh
  # Extract the initialization actions for builtin things.
  
! ## Let the user override the preprocessor autoconf found.
! test -n "${CPP+set}" || CPP="@CPP@"
! ${CPP} -DSCM_MAGIC_SNARFER "$@" | grep "^ *% *% *%" | sed -e "s/^ *% *% *%//"
Index: snarf.h
===================================================================
RCS file: /egcs/carton/cvsfiles/guile/guile-core/libguile/snarf.h,v
retrieving revision 1.9
diff -c -c -r1.9 snarf.h
*** snarf.h	1998/10/19 21:36:25	1.9
--- snarf.h	1998/10/25 03:09:01
***************
*** 55,61 ****
  	static char RANAME[]=STR
  #else
  #define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN)  \
! %%%	scm_make_gsubr (RANAME, REQ, OPT, VAR, CFN)
  #define SCM_PROC1(RANAME, STR, TYPE, CFN)  \
  %%%	scm_make_subr(RANAME, TYPE, CFN)
  #endif
--- 55,61 ----
  	static char RANAME[]=STR
  #else
  #define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN)  \
! %%%	scm_make_gsubr (RANAME, REQ, OPT, VAR, (SCM (*)()) CFN)
  #define SCM_PROC1(RANAME, STR, TYPE, CFN)  \
  %%%	scm_make_subr(RANAME, TYPE, CFN)
  #endif