|
From: <cli...@li...> - 2005-06-21 03:12:21
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/src error.d,1.132,1.133 ChangeLog,1.4707,1.4708 (Sam Steingold) 2. clisp/src socket.d,1.96,1.97 ChangeLog,1.4708,1.4709 (Sam Steingold) 3. clisp/src TODO,1.98,1.99 (Sam Steingold) 4. clisp/src makemake.in,1.561,1.562 ChangeLog,1.4709,1.4710 (Sam Steingold) 5. clisp/src pathname.d,1.377,1.378 ChangeLog,1.4710,1.4711 (Sam Steingold) 6. clisp/src w32shell.c,1.5,1.6 ChangeLog,1.4711,1.4712 (Sam Steingold) 7. clisp/src _clisp.c,1.35,1.36 ChangeLog,1.4712,1.4713 (Sam Steingold) 8. clisp/src TODO,1.99,1.100 (Sam Steingold) 9. clisp/src makemake.in,1.562,1.563 (Sam Steingold) 10. clisp/src ChangeLog,1.4713,1.4714 (Sam Steingold) 11. clisp/utils ccmp2c.c,1.8,1.9 (Sam Steingold) 12. clisp/modules/clx/new-clx clx.f,2.39,2.40 (Sam Steingold) 13. clisp/src ChangeLog,1.4714,1.4715 (Sam Steingold) 14. clisp/src pathname.d,1.378,1.379 (Sam Steingold) 15. clisp/src makemake.in,1.563,1.564 (Sam Steingold) --__--__-- Message: 1 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src error.d,1.132,1.133 ChangeLog,1.4707,1.4708 Date: Mon, 20 Jun 2005 20:04:06 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32247/src Modified Files: error.d ChangeLog Log Message: (check_uint32_replacement, check_sint32_replacement) (check_uint64_replacement, check_sint64_replacement): fixed the message: use the correct article Index: error.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/error.d,v retrieving revision 1.132 retrieving revision 1.133 diff -u -d -r1.132 -r1.133 --- error.d 13 Jun 2005 13:08:05 -0000 1.132 +++ error.d 20 Jun 2005 20:03:54 -0000 1.133 @@ -1574,7 +1574,7 @@ pushSTACK(obj); /* TYPE-ERROR slot DATUM */ pushSTACK(O(type_uint32)); /* TYPE-ERROR slot EXPECTED-TYPE */ pushSTACK(obj); pushSTACK(TheSubr(subr_self)->name); - check_value(type_error,GETTEXT("~S: ~S is not an 32-bit number")); + check_value(type_error,GETTEXT("~S: ~S is not a 32-bit number")); obj = value1; } while (!uint32_p(obj)); return obj; @@ -1591,7 +1591,7 @@ pushSTACK(obj); /* TYPE-ERROR slot DATUM */ pushSTACK(O(type_sint32)); /* TYPE-ERROR slot EXPECTED-TYPE */ pushSTACK(obj); pushSTACK(TheSubr(subr_self)->name); - check_value(type_error,GETTEXT("~S: ~S is not an 32-bit number")); + check_value(type_error,GETTEXT("~S: ~S is not a 32-bit number")); obj = value1; } while (!sint32_p(obj)); return obj; @@ -1608,7 +1608,7 @@ pushSTACK(obj); /* TYPE-ERROR slot DATUM */ pushSTACK(O(type_uint64)); /* TYPE-ERROR slot EXPECTED-TYPE */ pushSTACK(obj); pushSTACK(TheSubr(subr_self)->name); - check_value(type_error,GETTEXT("~S: ~S is not an 64-bit number")); + check_value(type_error,GETTEXT("~S: ~S is not a 64-bit number")); obj = value1; } while (!uint64_p(obj)); return obj; @@ -1625,7 +1625,7 @@ pushSTACK(obj); /* TYPE-ERROR slot DATUM */ pushSTACK(O(type_sint64)); /* TYPE-ERROR slot EXPECTED-TYPE */ pushSTACK(obj); pushSTACK(TheSubr(subr_self)->name); - check_value(type_error,GETTEXT("~S: ~S is not an 64-bit number")); + check_value(type_error,GETTEXT("~S: ~S is not a 64-bit number")); obj = value1; } while (!sint64_p(obj)); return obj; Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4707 retrieving revision 1.4708 diff -u -d -r1.4707 -r1.4708 --- ChangeLog 18 Jun 2005 17:18:32 -0000 1.4707 +++ ChangeLog 20 Jun 2005 20:03:55 -0000 1.4708 @@ -1,3 +1,9 @@ +2005-06-20 Sam Steingold <sd...@gn...> + + * error.d (check_uint32_replacement, check_sint32_replacement) + (check_uint64_replacement, check_sint64_replacement): + fixed the message: use the correct article + 2005-06-18 Bruno Haible <br...@cl...> * lispbibl.d (oint_data_len, oint_data_mask): On 64-bit platforms, --__--__-- Message: 2 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src socket.d,1.96,1.97 ChangeLog,1.4708,1.4709 Date: Mon, 20 Jun 2005 20:12:05 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4254/src Modified Files: socket.d ChangeLog Log Message: (resolve_host) [HAVE_IPV6]: handle numeric IPv6 addresses Index: socket.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/socket.d,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- socket.d 15 Jun 2005 12:29:29 -0000 1.96 +++ socket.d 20 Jun 2005 20:11:56 -0000 1.97 @@ -455,18 +455,15 @@ } } #ifdef HAVE_IPV6 - else if (fixnump(arg)) { /* what if we ever get fixnums>32 bit?! */ - var uintL ip = I_to_UL(arg); + else if ((fixnump(arg) && positivep(arg)) + || (bignump(arg) && positivep(arg) + && Bignum_length(arg)*intDsize <= sizeof(struct in6_addr))) { + /* arg is an integer of length at most 128 bit - IPv6 address */ var struct in6_addr addr; + UI_to_LEbytes(arg,8*sizeof(struct in6_addr),(uintB*)&addr); begin_system_call(); - memset(&addr,0,sizeof(struct in6_addr)); - memcpy(&addr,&ip,sizeof(uintL)); /* FIXME: endianness?! */ he = gethostbyaddr((char*)&addr,sizeof(struct in6_addr),AF_INET6); end_system_call(); - } else if (bignump(arg) && positivep(arg) - && Bignum_length(arg)*intDsize <= sizeof(struct in6_addr)) { - /* arg is an integer of length at most 128 bit - IPv6 address */ - NOTREACHED; /* FIXME */ } #endif else fehler_string_integer(arg); Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4708 retrieving revision 1.4709 diff -u -d -r1.4708 -r1.4709 --- ChangeLog 20 Jun 2005 20:03:55 -0000 1.4708 +++ ChangeLog 20 Jun 2005 20:11:57 -0000 1.4709 @@ -1,5 +1,9 @@ 2005-06-20 Sam Steingold <sd...@gn...> + * socket.d (resolve_host) [HAVE_IPV6]: handle numeric IPv6 addresses + +2005-06-20 Sam Steingold <sd...@gn...> + * error.d (check_uint32_replacement, check_sint32_replacement) (check_uint64_replacement, check_sint64_replacement): fixed the message: use the correct article --__--__-- Message: 3 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src TODO,1.98,1.99 Date: Mon, 20 Jun 2005 20:24:07 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11826/src Modified Files: TODO Log Message: resolve_host/IPv6 is done Index: TODO =================================================================== RCS file: /cvsroot/clisp/clisp/src/TODO,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- TODO 18 Jun 2005 17:25:23 -0000 1.98 +++ TODO 20 Jun 2005 20:24:04 -0000 1.99 @@ -6,8 +6,6 @@ bind-eval.tst failure on Linux/amd64 [bruno] -resolve_host/IPv6 [bruno] - workaround for an extra comma in _clisp.1 [sds] regression: resolution of logical pathnames is broken, try --__--__-- Message: 4 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src makemake.in,1.561,1.562 ChangeLog,1.4709,1.4710 Date: Mon, 20 Jun 2005 22:18:58 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12016/src Modified Files: makemake.in ChangeLog Log Message: (UTILCC): new makefile variable: simplifies the hack necessary to make some utilities (comment5 and txt2c) that must understand symbolic links to permit building in a separate directory on woe32/cygwin/mingw Index: makemake.in =================================================================== RCS file: /cvsroot/clisp/clisp/src/makemake.in,v retrieving revision 1.561 retrieving revision 1.562 diff -u -d -r1.561 -r1.562 --- makemake.in 10 Jun 2005 15:28:18 -0000 1.561 +++ makemake.in 20 Jun 2005 22:18:46 -0000 1.562 @@ -2361,36 +2361,37 @@ echotab "if [ ! -f unixconf.h ] ; then \$(TOUCH) unixconf.h ; fi" echol fi +if [ ${HSYS} = "win32gcc" ]; then + cat <<EOF +# **HACK**: avoid -mno-cygwin so that utilities understand symbolic links +UTILCC=gcc +EOF +else echol "UTILCC=CC" +fi for util in ${UTILS} ; do case ${util} in ccpaux | deema | txt2c | ccmp2c ) echol "${util}${HEXE} : ${UTILDIR_M}${util}.c" - echotab_to_HEXE "\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(CLFLAGS)" "${UTILDIR_CC}${util}.c" "${util}" + echotab_to_HEXE "\$(UTILCC) \$(CPPFLAGS) \$(CFLAGS) \$(CLFLAGS)" "${UTILDIR_CC}${util}.c" "${util}" echol ;; comment5 ) if [ $CC_NEED_CCPAUX = true ] ; then echol "${util}${HEXE} : ${UTILDIR_M}${util}.c ${CCPAUX}" echotab "${HERE}ccpaux${HEXE} < ${UTILDIR_}${util}.c > ${util}.c" - echotab_to_HEXE "\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(CLFLAGS)" "${util}.c" "${util}" + echotab_to_HEXE "\$(UTILCC) \$(CPPFLAGS) \$(CFLAGS) \$(CLFLAGS)" "${util}.c" "${util}" echotab "\$(RM) ${util}.c" echol OBSOLETE=$OBSOLETE" ${util}.c" else echol "${util}${HEXE} : ${UTILDIR_M}${util}.c" - if [ ${HSYS} = "win32gcc" ]; then - # **HACK**: avoid -mno-cygwin so that comment5.exe - # understands symbolic links - echotab_to_HEXE "gcc \$(CPPFLAGS) \$(CFLAGS) \$(CLFLAGS)" "${UTILDIR_CC}${util}.c" "${util}" - else - echotab_to_HEXE "\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(CLFLAGS)" "${UTILDIR_CC}${util}.c" "${util}" - fi + echotab_to_HEXE "\$(UTILCC) \$(CPPFLAGS) \$(CFLAGS) \$(CLFLAGS)" "${UTILDIR_CC}${util}.c" "${util}" echol fi ;; gctrigger | varbrace ) echol "${util}${HEXE} : ${UTILDIR_M}${util}.d comment5${HEXE}" echotabpipe "\$(COMMENT5) ${UTILDIR_CC}${util}.d > ${util}.c" - echotab_to_HEXE "\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(CLFLAGS)" "${util}.c" "${util}" + echotab_to_HEXE "\$(UTILCC) \$(CPPFLAGS) \$(CFLAGS) \$(CLFLAGS)" "${util}.c" "${util}" echotab "\$(RM) ${util}.c" echol OBSOLETE=$OBSOLETE" ${util}.c" ;; Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4709 retrieving revision 1.4710 diff -u -d -r1.4709 -r1.4710 --- ChangeLog 20 Jun 2005 20:11:57 -0000 1.4709 +++ ChangeLog 20 Jun 2005 22:18:50 -0000 1.4710 @@ -1,5 +1,12 @@ 2005-06-20 Sam Steingold <sd...@gn...> + * makemake.in (UTILCC): new makefile variable: simplifies the hack + necessary to make some utilities (comment5 and txt2c) that must + understand symbolic links to permit building in a separate + directory on woe32/cygwin/mingw + +2005-06-20 Sam Steingold <sd...@gn...> + * socket.d (resolve_host) [HAVE_IPV6]: handle numeric IPv6 addresses 2005-06-20 Sam Steingold <sd...@gn...> --__--__-- Message: 5 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src pathname.d,1.377,1.378 ChangeLog,1.4710,1.4711 Date: Mon, 20 Jun 2005 22:34:27 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21424/src Modified Files: pathname.d ChangeLog Log Message: (FullName): declare static to avoid a warning (handle_dup): fixed local variable type Index: pathname.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/pathname.d,v retrieving revision 1.377 retrieving revision 1.378 diff -u -d -r1.377 -r1.378 --- pathname.d 7 Jun 2005 11:00:32 -0000 1.377 +++ pathname.d 20 Jun 2005 22:34:18 -0000 1.378 @@ -5262,7 +5262,7 @@ wildcards aren't allowed. "." and ".." can be used. < fullname: buffer should be not less than MAX_PATH < result: true on success */ -BOOL FullName (LPCSTR shortname, LPSTR fullname) { +static BOOL FullName (LPCSTR shortname, LPSTR fullname) { var char current[_MAX_PATH]; var char * rent = current;/* current+end-device-pos, rest after X: */ var int state = 1; @@ -8125,7 +8125,7 @@ Similar to dup(oldfd), with error checking. To be called only inside begin/end_system_call(). */ global Handle handle_dup (Handle old_handle) { - int new_handle; + Handle new_handle; #if defined(UNIX) new_handle = dup(old_handle); if (new_handle < 0) { OS_error(); } Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4710 retrieving revision 1.4711 diff -u -d -r1.4710 -r1.4711 --- ChangeLog 20 Jun 2005 22:18:50 -0000 1.4710 +++ ChangeLog 20 Jun 2005 22:34:21 -0000 1.4711 @@ -1,5 +1,10 @@ 2005-06-20 Sam Steingold <sd...@gn...> + * pathname.d (FullName): declare static to avoid a warning + (handle_dup): fixed local variable type + +2005-06-20 Sam Steingold <sd...@gn...> + * makemake.in (UTILCC): new makefile variable: simplifies the hack necessary to make some utilities (comment5 and txt2c) that must understand symbolic links to permit building in a separate --__--__-- Message: 6 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src w32shell.c,1.5,1.6 ChangeLog,1.4711,1.4712 Date: Mon, 20 Jun 2005 22:36:38 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21747/src Modified Files: w32shell.c ChangeLog Log Message: (resolve_shell_shortcut, resolve_shell_shortcut_more) (resolve_shell_symlink): declare static to avoid warnings Index: w32shell.c =================================================================== RCS file: /cvsroot/clisp/clisp/src/w32shell.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- w32shell.c 27 May 2005 02:28:00 -0000 1.5 +++ w32shell.c 20 Jun 2005 22:36:35 -0000 1.6 @@ -36,7 +36,7 @@ > filename: name the shortcut file < resolved: buffer not less than MAX_PATH < result: true if link was successfully resolved */ -BOOL resolve_shell_shortcut (LPCSTR filename, LPSTR resolved) { +static BOOL resolve_shell_shortcut (LPCSTR filename, LPSTR resolved) { DWORD fileattr; HRESULT hres; IShellLink* psl; @@ -121,7 +121,7 @@ > filename : name of link file to resolve < resolved : buffer to receive resolved name < result : status of resolving and target file attributes */ -shell_shortcut_target_t +static shell_shortcut_target_t resolve_shell_shortcut_more (LPCSTR filename, LPSTR resolved) { char pathname[_MAX_PATH]; @@ -170,7 +170,8 @@ < resolved: buffer for resolved path and filename. < result: shell_shortcut_notresolved if file exists or link is invalid. otherwise - shortcut target status */ -shell_shortcut_target_t resolve_shell_symlink (LPCSTR filename, LPSTR resolved) +static shell_shortcut_target_t +resolve_shell_symlink (LPCSTR filename, LPSTR resolved) { char pathname[_MAX_PATH]; DWORD fileattr; Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4711 retrieving revision 1.4712 diff -u -d -r1.4711 -r1.4712 --- ChangeLog 20 Jun 2005 22:34:21 -0000 1.4711 +++ ChangeLog 20 Jun 2005 22:36:35 -0000 1.4712 @@ -2,6 +2,8 @@ * pathname.d (FullName): declare static to avoid a warning (handle_dup): fixed local variable type + * w32shell.c (resolve_shell_shortcut, resolve_shell_shortcut_more) + (resolve_shell_symlink): declare static to avoid warnings 2005-06-20 Sam Steingold <sd...@gn...> --__--__-- Message: 7 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src _clisp.c,1.35,1.36 ChangeLog,1.4712,1.4713 Date: Mon, 20 Jun 2005 22:39:35 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23148/src Modified Files: _clisp.c ChangeLog Log Message: (shell_quote, real_path, find_executable): added prototypes to avoid warnings Index: _clisp.c =================================================================== RCS file: /cvsroot/clisp/clisp/src/_clisp.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- _clisp.c 27 May 2005 02:28:00 -0000 1.35 +++ _clisp.c 20 Jun 2005 22:39:26 -0000 1.36 @@ -34,6 +34,8 @@ #if defined(WIN32_NATIVE) # undef UNICODE # include <windows.h> +int shell_quote (char * dest, const char * source); +BOOL real_path (LPCSTR namein, LPSTR nameout); # include "w32shell.c" #endif @@ -44,6 +46,7 @@ # include <stdlib.h> /* getenv, abort */ # include <errno.h> /* ENOMEM, ENOENT, errno */ # include <sys/param.h> /* MAXPATHLEN */ +int find_executable (const char * program_name); #include "execname.c" #if !defined(HAVE_PERROR_DECL) Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4712 retrieving revision 1.4713 diff -u -d -r1.4712 -r1.4713 --- ChangeLog 20 Jun 2005 22:36:35 -0000 1.4712 +++ ChangeLog 20 Jun 2005 22:39:26 -0000 1.4713 @@ -4,6 +4,8 @@ (handle_dup): fixed local variable type * w32shell.c (resolve_shell_shortcut, resolve_shell_shortcut_more) (resolve_shell_symlink): declare static to avoid warnings + * _clisp.c (shell_quote, real_path, find_executable): added + prototypes to avoid warnings 2005-06-20 Sam Steingold <sd...@gn...> --__--__-- Message: 8 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src TODO,1.99,1.100 Date: Mon, 20 Jun 2005 23:05:51 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6728/src Modified Files: TODO Log Message: removed "doc fix: more details on fixnum size on 64 bit CPU" (always 48) Index: TODO =================================================================== RCS file: /cvsroot/clisp/clisp/src/TODO,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- TODO 20 Jun 2005 20:24:04 -0000 1.99 +++ TODO 20 Jun 2005 23:05:49 -0000 1.100 @@ -37,8 +37,6 @@ $ clisp script.lisp works fine. -doc fix: more details on fixnum size on 64 bit CPU [bruno] - Readline interface problem: [2]> (macroexü *** - AREF: Index 9 für "(macroexü" ist zu groÃ. --__--__-- Message: 9 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src makemake.in,1.562,1.563 Date: Mon, 20 Jun 2005 23:12:27 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9739/src Modified Files: makemake.in Log Message: fixed a typo in the previous patch Index: makemake.in =================================================================== RCS file: /cvsroot/clisp/clisp/src/makemake.in,v retrieving revision 1.562 retrieving revision 1.563 diff -u -d -r1.562 -r1.563 --- makemake.in 20 Jun 2005 22:18:46 -0000 1.562 +++ makemake.in 20 Jun 2005 23:12:23 -0000 1.563 @@ -2366,7 +2366,7 @@ # **HACK**: avoid -mno-cygwin so that utilities understand symbolic links UTILCC=gcc EOF -else echol "UTILCC=CC" +else echol "UTILCC=$(CC)" fi for util in ${UTILS} ; do case ${util} in --__--__-- Message: 10 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src ChangeLog,1.4713,1.4714 Date: Mon, 20 Jun 2005 23:14:05 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10371/src Modified Files: ChangeLog Log Message: (new_statement): declare main%d static to avoid warnings Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4713 retrieving revision 1.4714 diff -u -d -r1.4713 -r1.4714 --- ChangeLog 20 Jun 2005 22:39:26 -0000 1.4713 +++ ChangeLog 20 Jun 2005 23:13:41 -0000 1.4714 @@ -6,6 +6,8 @@ (resolve_shell_symlink): declare static to avoid warnings * _clisp.c (shell_quote, real_path, find_executable): added prototypes to avoid warnings + * utils/ccmp2c.c (new_statement): declare main%d static + to avoid warnings 2005-06-20 Sam Steingold <sd...@gn...> --__--__-- Message: 11 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/utils ccmp2c.c,1.8,1.9 Date: Mon, 20 Jun 2005 23:13:43 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10371/utils Modified Files: ccmp2c.c Log Message: (new_statement): declare main%d static to avoid warnings Index: ccmp2c.c =================================================================== RCS file: /cvsroot/clisp/clisp/utils/ccmp2c.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ccmp2c.c 14 Dec 2004 11:56:55 -0000 1.8 +++ ccmp2c.c 20 Jun 2005 23:13:41 -0000 1.9 @@ -694,7 +694,7 @@ { /* Start a new function. */ func_number++; func_statements = 0; - printf ("void main%d (TEXT *curr)\n", func_number); + printf ("static void main%d (TEXT *curr)\n", func_number); printf ("{\n"); { string_t main_line; --__--__-- Message: 12 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/clx/new-clx clx.f,2.39,2.40 Date: Mon, 20 Jun 2005 23:16:55 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/clx/new-clx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11586/modules/clx/new-clx Modified Files: clx.f Log Message: (get_font_info_and_display, get_font_name) (make_visual_info, x_open_display, general_draw_text, font_char_info) (module__clx__init_function_2): declare static to avoid warnings (xlib_error_handler, xlib_io_error_handler, xlib_after_function): global prototypes to avoid warnings Index: clx.f =================================================================== RCS file: /cvsroot/clisp/clisp/modules/clx/new-clx/clx.f,v retrieving revision 2.39 retrieving revision 2.40 diff -u -d -r2.39 -r2.40 --- clx.f 7 Jun 2005 10:53:51 -0000 2.39 +++ clx.f 20 Jun 2005 23:16:52 -0000 2.40 @@ -971,8 +971,8 @@ static Font get_font (object obj); -XFontStruct *get_font_info_and_display (object obj, object* fontf, - Display **dpyf) +static XFontStruct *get_font_info_and_display (object obj, object* fontf, + Display **dpyf) { /* Fetches the font information from a font, if it isn't there already, query the server for it. Further more if a gcontext is passed in, fetch its font slot instead. @@ -1090,7 +1090,7 @@ return info; /* all done */ } -object get_font_name (object obj) +static object get_font_name (object obj) { pushSTACK(obj); /* the instance */ pushSTACK(`XLIB::NAME`); /* slot */ @@ -1438,7 +1438,7 @@ NOTIMPLEMENTED; } -object make_visual_info (Visual *vis) +static object make_visual_info (Visual *vis) { pushSTACK(`(XLIB::VISUAL-INFO)`); pushSTACK(fixnum(8)); funcall(L(make_structure),2); pushSTACK(value1); @@ -1609,7 +1609,7 @@ * Chapter 2 Displays * ----------------------------------------------------------------------- */ -Display *x_open_display (char* display_name, int display_number) { +static Display *x_open_display (char* display_name, int display_number) { Display *dpy; /* On one hand fetching the DISPLAY variable if in doubt is a nice @@ -1645,11 +1645,10 @@ return dpy; } +int xlib_error_handler (Display*, XErrorEvent*); +int xlib_io_error_handler (Display*); DEFUN(XLIB:OPEN-DISPLAY, &rest args) { /* (XLIB:OPEN-DISPLAY host &key :display &allow-other-keys) */ - int xlib_error_handler (Display*, XErrorEvent*); - int xlib_io_error_handler (Display*); - char *display_name = NULL; /* the host to connect to */ int display_number = 0; /* the display number */ Display *dpy; @@ -1926,6 +1925,7 @@ skipSTACK(1); } +int xlib_after_function (Display *display); DEFUN(XLIB:SET-DISPLAY-AFTER-FUNCTION, arg1 arg2) /* OK */ { /* TODO - check for function type [Not very important since the xlib_after_function should get this error.] */ @@ -1935,7 +1935,6 @@ if (nullp (STACK_0)) { X_CALL(XSetAfterFunction (dpy, NULL)); /* Q: Is that right?! */ } else { - int xlib_after_function (Display *display); X_CALL(XSetAfterFunction (dpy, xlib_after_function)); } VALUES1(STACK_0); @@ -3696,7 +3695,7 @@ return 2; } -void general_draw_text (int image_p) +static void general_draw_text (int image_p) { /* General text drawing routine to not to have to duplicate code for DRAW-GLYPHS and DRAW-IMAGE-GLYPHS. */ int size = 0; /* 8 or 16, 0="have to look into the font" */ @@ -4468,7 +4467,7 @@ /* 8.5 Character Attributes */ -XCharStruct *font_char_info (XFontStruct *fs, unsigned int index) +static XCharStruct *font_char_info (XFontStruct *fs, unsigned int index) { /* from XLoadFont(3X11): * @@ -7629,6 +7628,7 @@ } ##endif +void module__clx__init_function_2 (module_t *module); void module__clx__init_function_2 (module_t *module) { /* setze doch `XLIB::*DISPLAYS*` auf NIL ! */ #if 0 --__--__-- Message: 13 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src ChangeLog,1.4714,1.4715 Date: Mon, 20 Jun 2005 23:16:54 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11586/src Modified Files: ChangeLog Log Message: (get_font_info_and_display, get_font_name) (make_visual_info, x_open_display, general_draw_text, font_char_info) (module__clx__init_function_2): declare static to avoid warnings (xlib_error_handler, xlib_io_error_handler, xlib_after_function): global prototypes to avoid warnings Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4714 retrieving revision 1.4715 diff -u -d -r1.4714 -r1.4715 --- ChangeLog 20 Jun 2005 23:13:41 -0000 1.4714 +++ ChangeLog 20 Jun 2005 23:16:47 -0000 1.4715 @@ -8,6 +8,11 @@ prototypes to avoid warnings * utils/ccmp2c.c (new_statement): declare main%d static to avoid warnings + * modules/clx/new-clx/clx.f (get_font_info_and_display, get_font_name) + (make_visual_info, x_open_display, general_draw_text, font_char_info) + (module__clx__init_function_2): declare static to avoid warnings + (xlib_error_handler, xlib_io_error_handler, xlib_after_function): + global prototypes to avoid warnings 2005-06-20 Sam Steingold <sd...@gn...> --__--__-- Message: 14 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src pathname.d,1.378,1.379 Date: Mon, 20 Jun 2005 23:22:28 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15174/src Modified Files: pathname.d Log Message: indentation Index: pathname.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/pathname.d,v retrieving revision 1.378 retrieving revision 1.379 diff -u -d -r1.378 -r1.379 --- pathname.d 20 Jun 2005 22:34:18 -0000 1.378 +++ pathname.d 20 Jun 2005 23:22:19 -0000 1.379 @@ -4365,7 +4365,7 @@ var object string = wild2string(sample); push_solution_with(string); return; - } + } if (eq(sample,S(Kwild))) return; if (nullp(pattern)) { if (nullp(sample)) --__--__-- Message: 15 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src makemake.in,1.563,1.564 Date: Mon, 20 Jun 2005 23:58:08 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2245/src Modified Files: makemake.in Log Message: fix yet another type in the last patch Index: makemake.in =================================================================== RCS file: /cvsroot/clisp/clisp/src/makemake.in,v retrieving revision 1.563 retrieving revision 1.564 diff -u -d -r1.563 -r1.564 --- makemake.in 20 Jun 2005 23:12:23 -0000 1.563 +++ makemake.in 20 Jun 2005 23:58:05 -0000 1.564 @@ -2366,7 +2366,7 @@ # **HACK**: avoid -mno-cygwin so that utilities understand symbolic links UTILCC=gcc EOF -else echol "UTILCC=$(CC)" +else echol "UTILCC=\$(CC)" fi for util in ${UTILS} ; do case ${util} in --__--__-- _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest |