Menu
▾
▴
clisp-cvs digest, Vol 1 #1125 - 12 msgs
|
From: <cli...@li...> - 2005-06-07 03:16:45
|
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 unix.d,1.66,1.67 ChangeLog,1.4672,1.4673 (Bruno Haible) 2. clisp/src makemake.in,1.557,1.558 lispbibl.d,1.646,1.647 genclisph.d,1.190,1.191 ChangeLog,1.4673,1.4674 (Bruno Haible) 3. clisp/src win32.d,1.56,1.57 ChangeLog,1.4674,1.4675 (Bruno Haible) 4. clisp/src compelem.d,1.12,1.13 ChangeLog,1.4675,1.4676 (Sam Steingold) 5. clisp/utils clispload.lsp,1.47,1.48 (Sam Steingold) 6. clisp/utils clispload.lsp,1.48,1.49 (Sam Steingold) 7. clisp/src ChangeLog,1.4676,1.4677 (Bruno Haible) 8. clisp/utils clispload.lsp,1.49,1.50 (Bruno Haible) 9. clisp/src spvw_language.d,1.32,1.33 ChangeLog,1.4677,1.4678 (Bruno Haible) 10. clisp/modules/bindings/win32 win32.lisp,1.14,1.15 (Sam Steingold) 11. clisp/src ChangeLog,1.4678,1.4679 (Sam Steingold) 12. clisp/src socket.d,1.93,1.94 ChangeLog,1.4679,1.4680 (Sam Steingold) --__--__-- Message: 1 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src unix.d,1.66,1.67 ChangeLog,1.4672,1.4673 Date: Mon, 06 Jun 2005 12:43:51 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16526/src Modified Files: unix.d ChangeLog Log Message: Declare time_t_from_filetime, time_t_to_filetime, since they are exported through genclisph. Index: unix.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/unix.d,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- unix.d 11 Nov 2004 17:08:40 -0000 1.66 +++ unix.d 6 Jun 2005 12:43:42 -0000 1.67 @@ -1,6 +1,6 @@ /* * The include file for the UNIX version of CLISP - * Bruno Haible 1990-2004 + * Bruno Haible 1990-2005 * Sam Steingold 1998-2002 */ @@ -837,6 +837,14 @@ extern_C int iconv_close (iconv_t cd); #endif +/* Interpretation of FILETIME structure: */ +#ifdef UNIX_CYGWIN32 + #define WIN32_LEAN_AND_MEAN + #include <windows.h> + extern long time_t_from_filetime (const FILETIME * ptr); + extern void time_t_to_filetime (time_t time_in, FILETIME * out); +#endif + /* CLISP as a NeXTstep-GUI-Application: */ #ifdef NEXTAPP Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4672 retrieving revision 1.4673 diff -u -d -r1.4672 -r1.4673 --- ChangeLog 6 Jun 2005 12:41:44 -0000 1.4672 +++ ChangeLog 6 Jun 2005 12:43:42 -0000 1.4673 @@ -1,5 +1,10 @@ 2005-06-04 Bruno Haible <br...@cl...> + * unix.d (time_t_from_filetime, time_t_to_filetime) [UNIX_CYGWIN32]: + New declarations. + +2005-06-04 Bruno Haible <br...@cl...> + * lispbibl.d (convert_time_from_universal): New declaration. 2005-06-04 Bruno Haible <br...@cl...> --__--__-- Message: 2 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src makemake.in,1.557,1.558 lispbibl.d,1.646,1.647 genclisph.d,1.190,1.191 ChangeLog,1.4673,1.4674 Date: Mon, 06 Jun 2005 12:45:52 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17662/src Modified Files: makemake.in lispbibl.d genclisph.d ChangeLog Log Message: Include the C code for generating clisp.h in lispbibl.d. Index: makemake.in =================================================================== RCS file: /cvsroot/clisp/clisp/src/makemake.in,v retrieving revision 1.557 retrieving revision 1.558 diff -u -d -r1.557 -r1.558 --- makemake.in 31 May 2005 10:39:21 -0000 1.557 +++ makemake.in 6 Jun 2005 12:45:45 -0000 1.558 @@ -2186,7 +2186,7 @@ echolist "DFILES =" "$DFILES $ARI_ASMD $SP_ASMD" ".d" echol -echolist "CFILES =" "$DFILES $ARI_ASMD $ARI_ASMC $SP_ASMD" ".c" +echolist "CFILES =" "$DFILES $ARI_ASMD $ARI_ASMC $SP_ASMD gen.lispbibl" ".c" echol echolist "OBJECTS =" "$CPARTS $ARI_ASMS $SP_ASMS $GMALLOC" "${TOBJ}" @@ -2434,7 +2434,11 @@ for f in $DFILES ; do echol "${f}.c : ${f}.d comment5${HEXE}${XDECL_DEPENDENCIES}" - echotabpipe "\$(COMMENT5) ${f}.d${CHSCONVERT_FILTER} ${XDECL_FILTER} > ${f}.c" + gen_filter= + case "${f}" in + lispbibl) gen_filter=" | sed -e 's/^\\(%% .*\\)//'" ;; + esac + echotabpipe "\$(COMMENT5) ${f}.d${CHSCONVERT_FILTER}${gen_filter} ${XDECL_FILTER} > ${f}.c" echol done @@ -2495,6 +2499,12 @@ done fi +for f in lispbibl; do + echol "gen.${f}.c : ${f}.d comment5${HEXE}" + echotabpipe "\$(COMMENT5) ${f}.d${CHSCONVERT_FILTER} | sed -e '/^#line/n;ta;:a;s/^%% //;tb;s/^.*\$\$//;:b' > gen.${f}.c" + echol +done + if [ "${with_dynamic_ffi}" != no -a $HOS = unix ] ; then echol "trampoline${NEXT}trampoline.h :" echotab "cd trampoline && \$(MAKE) && \$(MAKE) check" @@ -2560,6 +2570,9 @@ if [ $f = lisparit ] ; then depends=$depends''$LISPARIT_INCLUDES''$ARI_ASMS fi + if [ $f = genclisph ] ; then + depends=$depends' gen.lispbibl' + fi for g in $depends ; do dependsc=$dependsc' '$g'.c' done Index: lispbibl.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/lispbibl.d,v retrieving revision 1.646 retrieving revision 1.647 diff -u -d -r1.646 -r1.647 --- lispbibl.d 6 Jun 2005 12:41:43 -0000 1.646 +++ lispbibl.d 6 Jun 2005 12:45:45 -0000 1.647 @@ -309,6 +309,12 @@ #define UNIX_BEOS # BeOS (UNIXlike) #endif #endif +%% #ifdef WIN32_NATIVE +%% printf("#define WIN32_NATIVE\n"); +%% #endif +%% #ifdef UNIX +%% printf("#define UNIX\n"); +%% #endif [...4566 lines suppressed...] +%% printf("extern void convert_to_foreign_mallocing (object fvd, object obj, void* data);\n"); # Convert Lisp data to foreign data. # The foreign data storage is reused. @@ -15127,6 +17408,7 @@ # Also beware against NULL pointers! They are not treated specially. # can trigger GC extern void convert_to_foreign_nomalloc (object fvd, object obj, void* data); +%% printf("extern void convert_to_foreign_nomalloc (object fvd, object obj, void* data);\n"); # Initialize the FFI. extern maygc void init_ffi (void); @@ -15137,6 +17419,7 @@ # used by SPVW #endif +%% #endif # ######################## THREADBIBL for THREAD.D ######################### # Index: genclisph.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/genclisph.d,v retrieving revision 1.190 retrieving revision 1.191 diff -u -d -r1.190 -r1.191 --- genclisph.d 30 May 2005 13:27:31 -0000 1.190 +++ genclisph.d 6 Jun 2005 12:45:45 -0000 1.191 @@ -207,2033 +207,51 @@ #else printf("#define CLISP_UNICODE 0\n"); #endif - #ifdef WIN32_NATIVE - printf("#define WIN32_NATIVE\n"); - #endif - #ifdef UNIX - printf("#define UNIX\n"); - #endif - /* assume unixconf.h and intparam.h are already included */ - printf("#define BIG_ENDIAN_P %d%s\n",BIG_ENDIAN_P,ULsuffix); [...2225 lines suppressed...] - printf("extern object allocate_fpointer (FOREIGN foreign);\n"); - printf("#define fp_validp(ptr) ((record_flags(ptr) & %d) == 0)\n",bit(7)); - printf("#define mark_fp_invalid(ptr) record_flags_set(ptr,%d)\n",bit(7)); - printf("extern object check_fpointer_replacement (object obj, bool restart_p);\n"); - printf("#ifndef COMPILE_STANDALONE\n"); - printf("static inline object check_fpointer (object obj, bool restart_p) {" - " if (!(fpointerp(obj) && fp_validp(TheFpointer(obj))))" - " obj = check_fpointer_replacement(obj,restart_p);" - " return obj;" - "}\n"); - printf("#endif\n"); - #endif - printf("extern void* my_malloc (size_t size);\n"); - printf("extern void* my_realloc (void *ptr, size_t size);\n"); - printf("#define unused %s\n",STRINGIFY(unused)); - printf("enum { seclass_foldable, seclass_no_se, seclass_read, seclass_write, seclass_default};\n"); + /* avoid some stupid warnings */ printf("#undef PACKAGE_BUGREPORT\n"); printf("#undef PACKAGE_NAME\n"); Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4673 retrieving revision 1.4674 diff -u -d -r1.4673 -r1.4674 --- ChangeLog 6 Jun 2005 12:43:42 -0000 1.4673 +++ ChangeLog 6 Jun 2005 12:45:45 -0000 1.4674 @@ -1,5 +1,16 @@ 2005-06-04 Bruno Haible <br...@cl...> + * lispbibl.d: Include the C code for generating clisp.h, with %%. + * genclisph.d (main): Remove most statements. Include gen.lispbibl.c. + Emit convert_time_to_universal_w32, convert_time_from_universal_w32 as + inline functions. + * makemake.in (CFILES): Add gen.lispbibl. + (lispbibl.c): Blank out the %% lines. + (gen.lispbibl.c): New rule. + (genclisph.[oi]): Depend on gen.lispbibl.c. + +2005-06-04 Bruno Haible <br...@cl...> + * unix.d (time_t_from_filetime, time_t_to_filetime) [UNIX_CYGWIN32]: New declarations. --__--__-- Message: 3 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src win32.d,1.56,1.57 ChangeLog,1.4674,1.4675 Date: Mon, 06 Jun 2005 13:25:13 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8165 Modified Files: win32.d ChangeLog Log Message: Don't set _UWIN when compiling with mingw. Index: win32.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/win32.d,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- win32.d 2 Jun 2005 14:49:40 -0000 1.56 +++ win32.d 6 Jun 2005 13:25:10 -0000 1.57 @@ -27,17 +27,15 @@ #define WIN32_LEAN_AND_MEAN /* avoid including junk */ #undef unused /* `unused' is used in function declarations. */ #ifdef __MINGW32__ -/* need this for isatty(), write() &c in <mingw/io.h> */ - #define _UWIN - #define ULONGLONG OS_ULONGLONG - #define ULONG OS_ULONG - #include <windows.h> - #undef ULONG - #undef ULONGLONG - #define unused_void (void) + #define ULONGLONG OS_ULONGLONG + #define ULONG OS_ULONG + #include <windows.h> + #undef ULONG + #undef ULONGLONG + #define unused_void (void) #else - #include <windows.h> - #define unused_void + #include <windows.h> + #define unused_void #endif /* Declaration of operating system types, @@ -233,6 +231,9 @@ #define off_t sint64 #undef SIZEOF_OFF_T /* on mingw, it was defined in unixconf.h */ #define SIZEOF_OFF_T 8 +#ifdef __MINGW32__ + #define lseek clisp_lseek /* avoid collision with prototype in <mingw/io.h> */ +#endif extern off_t lseek (HANDLE fd, off_t offset, DWORD mode); #undef SEEK_SET #undef SEEK_CUR @@ -337,6 +338,9 @@ requires linking with wsock32.lib */ /* Hacking the terminal */ +#ifdef __MINGW32__ + #define isatty clisp_isatty /* avoid collision with prototype in <mingw/io.h> */ +#endif extern int isatty (HANDLE handle); /* see win32aux.d */ /* used by stream.d */ Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4674 retrieving revision 1.4675 diff -u -d -r1.4674 -r1.4675 --- ChangeLog 6 Jun 2005 12:45:45 -0000 1.4674 +++ ChangeLog 6 Jun 2005 13:25:10 -0000 1.4675 @@ -1,3 +1,8 @@ +2005-06-06 Bruno Haible <br...@cl...> + + * win32.d (_UWIN): Remove macro. + (lseek, isatty) [MINGW]: Define to clisp-private names. + 2005-06-04 Bruno Haible <br...@cl...> * lispbibl.d: Include the C code for generating clisp.h, with %%. --__--__-- Message: 4 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src compelem.d,1.12,1.13 ChangeLog,1.4675,1.4676 Date: Mon, 06 Jun 2005 17:40:01 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5434/src Modified Files: compelem.d ChangeLog Log Message: (N_imagpart): use the normal Rational/Float contagion rules for reals Index: compelem.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/compelem.d,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- compelem.d 11 Dec 2004 14:16:17 -0000 1.12 +++ compelem.d 6 Jun 2005 17:39:50 -0000 1.13 @@ -43,10 +43,12 @@ #if 0 local object N_imagpart_R (object x) { - return (N_realp(x) ? Fixnum_0 : TheComplex(x)->c_imag); + return (N_realp(x) + ? (R_floatp(x) ? RA_F_exact_contagion_R(Fixnum_0,x) : Fixnum_0) + : TheComplex(x)->c_imag); } #else # Macro spart Code - #define N_imagpart_R(x) (N_realp(x) ? Fixnum_0 : (object)TheComplex(x)->c_imag) + #define N_imagpart_R(x) (N_realp(x) ? (R_floatp(x) ? RA_F_exact_contagion_R(Fixnum_0,x) : Fixnum_0) : (object)TheComplex(x)->c_imag) #endif # N_conjugate_N(x) liefert die konjugiert komplexe Zahl zur Zahl x. Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4675 retrieving revision 1.4676 diff -u -d -r1.4675 -r1.4676 --- ChangeLog 6 Jun 2005 13:25:10 -0000 1.4675 +++ ChangeLog 6 Jun 2005 17:39:51 -0000 1.4676 @@ -1,3 +1,9 @@ +2005-06-06 Sam Steingold <sd...@gn...> + + * compelem.d (N_imagpart): use the normal Rational/Float contagion + rules for reals + * clispload.lsp (*expected-failures*): removed MISC.598 + 2005-06-06 Bruno Haible <br...@cl...> * win32.d (_UWIN): Remove macro. --__--__-- Message: 5 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/utils clispload.lsp,1.47,1.48 Date: Mon, 06 Jun 2005 17:39:52 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5434/utils Modified Files: clispload.lsp Log Message: (N_imagpart): use the normal Rational/Float contagion rules for reals Index: clispload.lsp =================================================================== RCS file: /cvsroot/clisp/clisp/utils/clispload.lsp,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- clispload.lsp 5 Jun 2005 22:59:33 -0000 1.47 +++ clispload.lsp 6 Jun 2005 17:39:50 -0000 1.48 @@ -100,7 +100,7 @@ ;; CLISP supports complex numbers with realpart and imagpart of different ;; types. - COMPLEX.2 COMPLEX.4 COMPLEX.5 IMAGPART.4 MISC.598 + COMPLEX.2 COMPLEX.4 COMPLEX.5 IMAGPART.4 ;; Paul Dietz assumes that the classes STREAM and CONDITION are disjoint. ;; In CLISP they are not, because the user can create subclasses inheriting --__--__-- Message: 6 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/utils clispload.lsp,1.48,1.49 Date: Mon, 06 Jun 2005 17:43:00 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7768/utils Modified Files: clispload.lsp Log Message: whitespace Index: clispload.lsp =================================================================== RCS file: /cvsroot/clisp/clisp/utils/clispload.lsp,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- clispload.lsp 6 Jun 2005 17:39:50 -0000 1.48 +++ clispload.lsp 6 Jun 2005 17:42:58 -0000 1.49 @@ -100,7 +100,7 @@ ;; CLISP supports complex numbers with realpart and imagpart of different ;; types. - COMPLEX.2 COMPLEX.4 COMPLEX.5 IMAGPART.4 + COMPLEX.2 COMPLEX.4 COMPLEX.5 IMAGPART.4 ;; Paul Dietz assumes that the classes STREAM and CONDITION are disjoint. ;; In CLISP they are not, because the user can create subclasses inheriting --__--__-- Message: 7 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src ChangeLog,1.4676,1.4677 Date: Mon, 06 Jun 2005 17:54:57 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12870/src Modified Files: ChangeLog Log Message: Expected failures for things that we won't fix before the next release. Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4676 retrieving revision 1.4677 diff -u -d -r1.4676 -r1.4677 --- ChangeLog 6 Jun 2005 17:39:51 -0000 1.4676 +++ ChangeLog 6 Jun 2005 17:54:47 -0000 1.4677 @@ -1,3 +1,7 @@ +2005-06-06 Bruno Haible <br...@cl...> + + * clispload.lsp (*expected-failures*): Add DECLARATION.[4-11]. + 2005-06-06 Sam Steingold <sd...@gn...> * compelem.d (N_imagpart): use the normal Rational/Float contagion --__--__-- Message: 8 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/utils clispload.lsp,1.49,1.50 Date: Mon, 06 Jun 2005 17:54:48 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12870/utils Modified Files: clispload.lsp Log Message: Expected failures for things that we won't fix before the next release. Index: clispload.lsp =================================================================== RCS file: /cvsroot/clisp/clisp/utils/clispload.lsp,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- clispload.lsp 6 Jun 2005 17:42:58 -0000 1.49 +++ clispload.lsp 6 Jun 2005 17:54:46 -0000 1.50 @@ -180,6 +180,11 @@ ;; The interaction between TRACE and generic functions needs to be fixed. TRACE.13 TRACE.14 + ;; The interaction between PROCLAIM DECLARATION and + ;; DEFTYPE/DEFSTRUCT/DEFCLASS needs to be fixed. + DECLARATION.4 DECLARATION.5 DECLARATION.6 DECLARATION.7 DECLARATION.8 + DECLARATION.9 DECLARATION.10 DECLARATION.11 + ;; Requires a rewrite of parts of the pretty-printer. PPRINT-TABULAR.6 PPRINT-TABULAR.7 PPRINT-TABULAR.8 PPRINT-TABULAR.9 PPRINT-TABULAR.10 PPRINT-TABULAR.11 PPRINT-TABULAR.12 PPRINT-TABULAR.13 --__--__-- Message: 9 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src spvw_language.d,1.32,1.33 ChangeLog,1.4677,1.4678 Date: Mon, 06 Jun 2005 20:13:12 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16306 Modified Files: spvw_language.d ChangeLog Log Message: Handle the case (argv_localedir == NULL) in a platform independent way. Index: spvw_language.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/spvw_language.d,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- spvw_language.d 1 Jun 2005 12:54:33 -0000 1.32 +++ spvw_language.d 6 Jun 2005 20:12:51 -0000 1.33 @@ -220,10 +220,11 @@ } } #endif - #if defined(WIN32_NATIVE) - /* this avoids a segfault on mingw */ - if (argv_localedir == NULL) argv_localedir = ""; - #endif + # If argv_localedir is NULL, the user is not interested in localized + # messages. Therefore use a directory that doesn't contain message + # catalogs. + if (argv_localedir == NULL) + argv_localedir = "/nonexistent"; bindtextdomain("clisp",argv_localedir); bindtextdomain("clisplow",argv_localedir); if (must_free_argv_localedir) free((void*)argv_localedir); Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4677 retrieving revision 1.4678 diff -u -d -r1.4677 -r1.4678 --- ChangeLog 6 Jun 2005 17:54:47 -0000 1.4677 +++ ChangeLog 6 Jun 2005 20:12:52 -0000 1.4678 @@ -1,5 +1,11 @@ 2005-06-06 Bruno Haible <br...@cl...> + * spvw_language.d (init_language): When argv_localedir is NULL, don't + use any message catalogs, not even those in the default location + /usr/share/locale. + +2005-06-06 Bruno Haible <br...@cl...> + * clispload.lsp (*expected-failures*): Add DECLARATION.[4-11]. 2005-06-06 Sam Steingold <sd...@gn...> --__--__-- Message: 10 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/bindings/win32 win32.lisp,1.14,1.15 Date: Mon, 06 Jun 2005 21:57:01 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/bindings/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8961/modules/bindings/win32 Modified Files: win32.lisp Log Message: use full paths for :LIBRARY arguments (needed on cygwin) Index: win32.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/modules/bindings/win32/win32.lisp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- win32.lisp 5 Apr 2005 22:47:36 -0000 1.14 +++ win32.lisp 6 Jun 2005 21:56:58 -0000 1.15 @@ -21,22 +21,29 @@ ;; this is not necessary: we are not creating a C file anyway ;;(c-lines "#define WINVER 0x0500~%#include <windows.h>~%") -(def-call-out GetCommandLineA (:library "kernel32.dll") +(defconstant system32 (ext:string-concat (ext:getenv "WINDIR") "\\system32\\")) +(defconstant advapi32 (ext:string-concat system32 "advapi32.dll")) +(defconstant kernel32 (ext:string-concat system32 "kernel32.dll")) +(defconstant secur32 (ext:string-concat system32 "secur32.dll")) +(defconstant shell32 (ext:string-concat system32 "shell32.dll")) +(defconstant user32 (ext:string-concat system32 "user32.dll")) + +(def-call-out GetCommandLineA (:library kernel32) (:arguments) (:return-type c-string)) -(def-call-out GetLastError (:library "kernel32.dll") +(def-call-out GetLastError (:library kernel32) (:arguments) (:return-type dword)) -(def-call-out GetCurrentProcess (:library "kernel32.dll") +(def-call-out GetCurrentProcess (:library kernel32) (:arguments) (:return-type handle)) -(def-call-out GetCurrentThread (:library "kernel32.dll") +(def-call-out GetCurrentThread (:library kernel32) (:arguments) (:return-type handle)) -(def-call-out GetCurrentProcessId (:library "kernel32.dll") +(def-call-out GetCurrentProcessId (:library kernel32) (:arguments) (:return-type dword)) -(def-call-out CloseHandle (:library "kernel32.dll") +(def-call-out CloseHandle (:library kernel32) (:arguments (handle handle)) (:return-type boolean)) ;; (c-lines "#include <winnt.h>~%") @@ -66,7 +73,7 @@ (PROCESS_ALL_ACCESS #.(cl:logior STANDARD_RIGHTS_REQUIRED SYNCHRONIZE #xFFF))) -(def-call-out OpenProcess (:library "kernel32.dll") +(def-call-out OpenProcess (:library kernel32) (:arguments (access-flag dword) ; PROCESS (inherit-handle boolean) (pid dword)) @@ -80,13 +87,13 @@ (EWX_FORCE #x4) (EWX_POWEROFF #x8) (EWX_FORCEIFHUNG #x10)) -(def-call-out ExitWindowsEx (:library "User32.dll") +(def-call-out ExitWindowsEx (:library user32) (:arguments (flags uint) ; EWX (reserved dword)) (:return-type boolean)) (def-c-enum GR_OBJECTS GR_GDIOBJECTS GR_USEROBJECTS) -(def-call-out GetGuiResources (:library "User32.dll") +(def-call-out GetGuiResources (:library user32) (:arguments (process handle) (flags dword)) ; GR_OBJECTS (:return-type dword)) @@ -107,7 +114,7 @@ (LR_CREATEDIBSECTION 8192) (LR_COPYFROMRESOURCE #x4000) (LR_SHARED 32768)) -(def-call-out LoadImageA (:library "User32.dll") +(def-call-out LoadImageA (:library user32) (:arguments (application-instance-handle handle) (image-name c-string) (type uint) (width int) (height int) @@ -122,47 +129,47 @@ (defconstant BUFSIZ 4096) ; <stdio.h> (defconstant MAX_PATH 260)) ; <windef.h> -(def-call-out GetModuleFileNameA (:library "kernel32.dll") +(def-call-out GetModuleFileNameA (:library kernel32) (:arguments (application-instance-handle handle) (name (c-ptr (c-array-max character #.MAX_PATH)) :out :alloca) (size dword)) ; always pass MAX_PATH as the second argument (:return-type dword)) -(def-call-out GetModuleHandleA (:library "kernel32.dll") +(def-call-out GetModuleHandleA (:library kernel32) (:arguments (name c-string)) (:return-type handle)) ;; (c-lines "#include <winicon.h>~%") -(def-call-out GetConsoleTitleA (:library "kernel32.dll") +(def-call-out GetConsoleTitleA (:library kernel32) (:arguments (buffer (c-ptr (c-array-max character #.BUFSIZ)) :out :alloca) (size dword)) ; always pass BUFSIZ as the only argument (:return-type dword)) -(def-call-out SetConsoleTitleA (:library "kernel32.dll") +(def-call-out SetConsoleTitleA (:library kernel32) (:arguments (title c-string)) (:return-type boolean)) ;; system information -(def-call-out GetSystemDirectoryA (:library "kernel32.dll") +(def-call-out GetSystemDirectoryA (:library kernel32) (:arguments (buffer (c-ptr (c-array-max character #.MAX_PATH)) :out :alloca) (size uint)) ; pass MAX_PATH (:return-type uint)) -(def-call-out GetWindowsDirectoryA (:library "kernel32.dll") +(def-call-out GetWindowsDirectoryA (:library kernel32) (:arguments (buffer (c-ptr (c-array-max character #.MAX_PATH)) :out :alloca) (size uint)) ; pass MAX_PATH (:return-type uint)) -(def-call-out GetCurrentDirectoryA (:library "kernel32.dll") +(def-call-out GetCurrentDirectoryA (:library kernel32) (:arguments (size dword) ; pass MAX_PATH (buffer (c-ptr (c-array-max character #.MAX_PATH)) :out :alloca)) (:return-type dword)) -(def-call-out GetVersion (:library "kernel32.dll") +(def-call-out GetVersion (:library kernel32) (:arguments) (:return-type dword)) ;; user name (eval-when (compile eval load) (defconstant UNLEN 256)) ; <lmcons.h> -(def-call-out GetUserNameA (:library "advapi32.dll") +(def-call-out GetUserNameA (:library advapi32) (:arguments (buffer (c-ptr (c-array-max character #.UNLEN)) :out :alloca) (size (c-ptr dword) :in-out)) ; pass UNLEN (:return-type boolean)) @@ -178,12 +185,12 @@ (NameUserPrincipal 8) (NameCanonicalEx 9) (NameServicePrincipal 10)) -(def-call-out GetUserNameExA (:library "secur32.dll") +(def-call-out GetUserNameExA (:library secur32) (:arguments (name-format EXTENDED_NAME_FORMAT) (buffer (c-ptr (c-array-max character #.UNLEN)) :out :alloca) (size (c-ptr ulong) :in-out)) ; pass UNLEN (:return-type boolean)) -(def-call-out GetComputerObjectNameA (:library "secur32.dll") +(def-call-out GetComputerObjectNameA (:library secur32) (:arguments (name-format EXTENDED_NAME_FORMAT) (buffer (c-ptr (c-array-max character #.UNLEN)) :out :alloca) (size (c-ptr ulong) :in-out)) ; pass UNLEN @@ -193,7 +200,7 @@ (eval-when (compile eval load) (defconstant MAX_COMPUTERNAME_LENGTH 16)) ; <winbase.h> -(def-call-out GetComputerNameA (:library "kernel32.dll") +(def-call-out GetComputerNameA (:library kernel32) (:arguments (buffer (c-ptr (c-array-max character #.MAX_COMPUTERNAME_LENGTH)) :out :alloca) (size (c-ptr dword) :in-out)) ; pass MAX_COMPUTERNAME_LENGTH @@ -210,7 +217,7 @@ ComputerNamePhysicalDnsFullyQualified ComputerNameMax) -(def-call-out GetComputerNameExA (:library "kernel32.dll") +(def-call-out GetComputerNameExA (:library kernel32) (:arguments (type-name COMPUTER_NAME_FORMAT) (buffer (c-ptr (c-array-max character #.MAX_COMPUTERNAME_LENGTH)) :out :alloca) @@ -246,7 +253,7 @@ (SW_SHOWDEFAULT 10) (SW_FORCEMINIMIZE 11) (SW_MAX 11)) -(def-call-out ShellExecuteA (:library "shell32.dll") +(def-call-out ShellExecuteA (:library shell32) (:arguments (parent handle) (operation c-string) (file c-string) (parameters c-string) (directory c-string) (show SHOW_COMMAND)) (:return-type int)) --__--__-- Message: 11 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src ChangeLog,1.4678,1.4679 Date: Mon, 06 Jun 2005 21:57:00 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8961/src Modified Files: ChangeLog Log Message: use full paths for :LIBRARY arguments (needed on cygwin) Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4678 retrieving revision 1.4679 diff -u -d -r1.4678 -r1.4679 --- ChangeLog 6 Jun 2005 20:12:52 -0000 1.4678 +++ ChangeLog 6 Jun 2005 21:56:48 -0000 1.4679 @@ -1,3 +1,8 @@ +2005-06-06 Sam Steingold <sd...@gn...> + + * modules/bindings/win32/win32.lisp: use full paths for :LIBRARY + arguments (needed on cygwin) + 2005-06-06 Bruno Haible <br...@cl...> * spvw_language.d (init_language): When argv_localedir is NULL, don't --__--__-- Message: 12 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src socket.d,1.93,1.94 ChangeLog,1.4679,1.4680 Date: Mon, 06 Jun 2005 21:57:35 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9577/src Modified Files: socket.d ChangeLog Log Message: (MACHINE-INSTANCE, socket_getlocalname_aux, socket_getpeername): avoid a GCC warning "value computed is not used" Index: socket.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/socket.d,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- socket.d 6 Jun 2005 11:50:01 -0000 1.93 +++ socket.d 6 Jun 2005 21:57:32 -0000 1.94 @@ -215,7 +215,7 @@ #ifdef HAVE_IPV6 if (h->h_addrtype == AF_INET6) { var char buffer[45+1]; - ipv6_ntop(buffer,*(const struct in6_addr*)h->h_addr); + (void)ipv6_ntop(buffer,*(const struct in6_addr*)h->h_addr); pushSTACK(ascii_to_string(" [")); pushSTACK(asciz_to_string(buffer,O(misc_encoding))); pushSTACK(ascii_to_string("]")); @@ -756,7 +756,7 @@ switch (((struct sockaddr *)&addr)->sa_family) { #ifdef HAVE_IPV6 case AF_INET6: - ipv6_ntop(hd->hostname,addr.inaddr6.sin6_addr); + (void)ipv6_ntop(hd->hostname,addr.inaddr6.sin6_addr); hd->port = ntohs(addr.inaddr6.sin6_port); break; #endif @@ -804,7 +804,7 @@ switch (((struct sockaddr *)&addr)->sa_family) { #ifdef HAVE_IPV6 case AF_INET6: - ipv6_ntop(hd->hostname,addr.inaddr6.sin6_addr); + (void)ipv6_ntop(hd->hostname,addr.inaddr6.sin6_addr); hd->port = ntohs(addr.inaddr6.sin6_port); if (resolve_p) hp = gethostbyaddr((const char *)&addr.inaddr6.sin6_addr, Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4679 retrieving revision 1.4680 diff -u -d -r1.4679 -r1.4680 --- ChangeLog 6 Jun 2005 21:56:48 -0000 1.4679 +++ ChangeLog 6 Jun 2005 21:57:33 -0000 1.4680 @@ -1,5 +1,10 @@ 2005-06-06 Sam Steingold <sd...@gn...> + * socket.d (MACHINE-INSTANCE, socket_getlocalname_aux) + (socket_getpeername): avoid a GCC warning "value computed is not used" + +2005-06-06 Sam Steingold <sd...@gn...> + * modules/bindings/win32/win32.lisp: use full paths for :LIBRARY arguments (needed on cygwin) --__--__-- _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest |
