From: <cli...@li...> - 2005-06-07 12:20:10
|
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/modules/syscalls calls.c,1.125,1.126 (Bruno Haible) 2. clisp/src ChangeLog,1.4686,1.4687 (Bruno Haible) 3. clisp/src makemake.in,1.559,1.560 ChangeLog,1.4687,1.4688 (Bruno Haible) 4. clisp/queued - New directory (Bruno Haible) 5. clisp/src ChangeLog,1.4688,1.4689 (Bruno Haible) 6. clisp/modules/berkeley-db bdb.c,1.86,1.87 (Bruno Haible) 7. clisp/src win32.d,1.58,1.59 ChangeLog,1.4689,1.4690 (Bruno Haible) 8. clisp/queued patch01,NONE,1.1 patch02,NONE,1.1 (Bruno Haible) 9. clisp/src ChangeLog,1.4690,1.4691 (Bruno Haible) 10. clisp Makefile.devel,1.130,1.131 (Bruno Haible) 11. clisp/src/autoconf aclocal.m4,1.150,1.151 (Bruno Haible) --__--__-- Message: 1 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/modules/syscalls calls.c,1.125,1.126 Date: Tue, 07 Jun 2005 11:10:03 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/syscalls In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26579/modules/syscalls Modified Files: calls.c Log Message: Use 64-bit variable for off_t in POSIX::STREAM-LOCK. Index: calls.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/syscalls/calls.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- calls.c 7 Jun 2005 11:00:38 -0000 1.125 +++ calls.c 7 Jun 2005 11:10:00 -0000 1.126 @@ -70,9 +70,6 @@ #if defined(HAVE_SYSLOG_H) # include <syslog.h> #endif -#if defined(HAVE_STDLIB_H) -# include <stdlib.h> -#endif #if defined(HAVE_UTMPX_H) # include <utmpx.h> #endif @@ -81,6 +78,7 @@ #endif #include <stdio.h> /* for BUFSIZ */ +#include <stdlib.h> #include <string.h> /* for strcpy(), strcat() */ /* #define DEBUG */ @@ -112,13 +110,14 @@ bool lock_p = !nullp(STACK_4), failed_p; object stream; uintL start = missingp(STACK_1) ? 0 : I_to_UL(STACK_1); - uintL length; #if defined(WIN32_NATIVE) + uint64 length; DWORD flags = !lock_p ? 0 : (missingp(STACK_2) ? LOCKFILE_EXCLUSIVE_LOCK : 0) | (nullp(STACK_3) ? 0 : LOCKFILE_FAIL_IMMEDIATELY); OVERLAPPED ol = {0,0,start,0,NULL}; #else + off_t length; int cmd = nullp(STACK_3) ? F_SETLK : F_SETLKW; struct flock fl; fl.l_type = missingp(STACK_2) ? F_RDLCK : F_WRLCK; @@ -134,16 +133,16 @@ if (missingp(STACK_0)) { /* no :LENGTH => use file size */ if (posfixnump(STACK_5)) { /* no stream given, use OS to get file size */ # if defined(WIN32_NATIVE) - LARGE_INTEGER size; + uint32 size_hi; + uint32 size_lo; begin_system_call(); - size.LowPart = GetFileSize(fd,(DWORD*)&size.HighPart); + size_lo = GetFileSize(fd,(DWORD*)&size_hi); /* Value returned can be (LONG) -1 even on success, check the last error code */ - if (size.LowPart == INVALID_FILE_SIZE) failed_p = GetLastError(); - else failed_p = 0; + failed_p = (size_lo == INVALID_FILE_SIZE) && (GetLastError() != 0); end_system_call(); if (failed_p) goto stream_lock_error; - length = size.LowPart; + length = ((uint64)size_hi << 32) | (uint64)size_lo; # elif defined(HAVE_FSTAT) struct stat st; begin_system_call(); @@ -156,12 +155,23 @@ # endif } else { /* a valid stream has been supplied */ pushSTACK(stream); funcall(L(file_length),1); + #ifdef I_to_uint64 + length = (sizeof(length) > 4 ? I_to_UQ(value1) : I_to_UL(value1)); + #else length = I_to_UL(value1); + #endif } - } else length = I_to_UL(STACK_0); + } else { + #ifdef I_to_uint64 + length = (sizeof(length) > 4 ? I_to_UQ(STACK_0) : I_to_UL(STACK_0)); + #else + length = I_to_UL(STACK_0); + #endif + } begin_system_call(); #if defined(WIN32_NATIVE) if (lock_p) { + /* FIXME: LockFileEx does not exist on Windows95/98/ME. */ failed_p = !LockFileEx(fd,flags,0,length,0,&ol); if (failed_p && nullp(STACK_3) && GetLastError() == ERROR_LOCK_VIOLATION) failed_p = lock_p = false; /* failed to lock, :BLOCK NIL */ @@ -174,9 +184,12 @@ failed_p = lock_p = false; /* failed to lock, :BLOCK NIL */ #endif end_system_call(); - if (failed_p) { stream_lock_error: - if (eq(stream,nullobj)) OS_error(); - else OS_filestream_error(stream); + if (failed_p) { + stream_lock_error: + if (eq(stream,nullobj)) + OS_error(); + else + OS_filestream_error(stream); } skipSTACK(6); VALUES_IF(lock_p); --__--__-- Message: 2 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src ChangeLog,1.4686,1.4687 Date: Tue, 07 Jun 2005 11:10:04 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26579/src Modified Files: ChangeLog Log Message: Use 64-bit variable for off_t in POSIX::STREAM-LOCK. Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4686 retrieving revision 1.4687 diff -u -d -r1.4686 -r1.4687 --- ChangeLog 7 Jun 2005 11:08:13 -0000 1.4686 +++ ChangeLog 7 Jun 2005 11:10:01 -0000 1.4687 @@ -1,5 +1,12 @@ 2005-06-04 Bruno Haible <br...@cl...> + * modules/syscalls/calls.c: Assume stdlib.h exists. + (POSIX::STREAM-LOCK): Use a 64-bit variable for the length on systems + with 64-bit off_t and on Woe32. Fix wrong assigment from GetLastError() + to 'bool'. + +2005-06-04 Bruno Haible <br...@cl...> + * modules/regexp/regex.c: Undo 2005-03-18 patch. * modules/regexp/alloca_.h: New file, from gnulib. * modules/regexp/alloca.c: New file, from gnulib. --__--__-- Message: 3 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src makemake.in,1.559,1.560 ChangeLog,1.4687,1.4688 Date: Tue, 07 Jun 2005 11:12:26 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27887/src Modified Files: makemake.in ChangeLog Log Message: Ignore --with-module=... options for modules that are already contained in BASE_MODULES. Index: makemake.in =================================================================== RCS file: /cvsroot/clisp/clisp/src/makemake.in,v retrieving revision 1.559 retrieving revision 1.560 diff -u -d -r1.559 -r1.560 --- makemake.in 7 Jun 2005 10:57:51 -0000 1.559 +++ makemake.in 7 Jun 2005 11:12:20 -0000 1.560 @@ -208,6 +208,10 @@ with_dynamic_ffi=no # often set to yes by the toplevel configure with_dynamic_modules=no with_threads=no +# i18n: essential for internationalized programs +# syscalls: very useful for scripting +# regexp: useful for scripting and text processing +BASE_MODULES="i18n syscalls regexp" verbose=${CLISP_MAKEMAKE_VERBOSE:-false} # Handle --with-... arguments @@ -219,7 +223,13 @@ shift ;; -with-module=* | --with-module=*) - MODULES="$MODULES "`echol "$1"|sed 's/-*with-module=//'` + module=`echol "$1"|sed 's/-*with-module=//'` + # We don't need to add $module to MODULES if it's already contained + # in BASE_MODULES. + case " $BASE_MODULES " in + *" $module "*) ;; + *) MODULES="$MODULES $module" ;; + esac shift ;; # Accept --with and --without options like configure does. @@ -2113,10 +2123,7 @@ echol "CLISP_VERSION=clisp-\$(VERSION)" echol echol "# List of add-on modules that are already hardwired in the base linking set" -# i18n: essential for internationalized programs -# syscalls: very useful for scripting -# regexp: useful for scripting and text processing -echol "BASE_MODULES = i18n syscalls regexp" +echol "BASE_MODULES = ${BASE_MODULES}" echol echol "COMMENT5 = ${HERE}comment5" Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4687 retrieving revision 1.4688 diff -u -d -r1.4687 -r1.4688 --- ChangeLog 7 Jun 2005 11:10:01 -0000 1.4687 +++ ChangeLog 7 Jun 2005 11:12:21 -0000 1.4688 @@ -1,3 +1,9 @@ +2005-06-06 Bruno Haible <br...@cl...> + + * makemake.in: Ignore --with-module=... options for modules that are + already contained in BASE_MODULES. + Reported by <bs...@bw...>. + 2005-06-04 Bruno Haible <br...@cl...> * modules/syscalls/calls.c: Assume stdlib.h exists. --__--__-- Message: 4 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/queued - New directory Date: Tue, 07 Jun 2005 11:14:57 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/queued In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29461/queued Log Message: Directory /cvsroot/clisp/clisp/queued added to the repository --__--__-- Message: 5 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src ChangeLog,1.4688,1.4689 Date: Tue, 07 Jun 2005 11:22:02 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32016/src Modified Files: ChangeLog Log Message: Better way to call I_to_LEbytes. Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4688 retrieving revision 1.4689 diff -u -d -r1.4688 -r1.4689 --- ChangeLog 7 Jun 2005 11:12:21 -0000 1.4688 +++ ChangeLog 7 Jun 2005 11:21:36 -0000 1.4689 @@ -1,5 +1,10 @@ 2005-06-06 Bruno Haible <br...@cl...> + * modules/berkeley-db/bdb.c (fill_dbt): Call I_to_LEbytes differently, + avoiding a prior memset(). + +2005-06-06 Bruno Haible <br...@cl...> + * makemake.in: Ignore --with-module=... options for modules that are already contained in BASE_MODULES. Reported by <bs...@bw...>. --__--__-- Message: 6 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/modules/berkeley-db bdb.c,1.86,1.87 Date: Tue, 07 Jun 2005 11:21:38 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/berkeley-db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32016/modules/berkeley-db Modified Files: bdb.c Log Message: Better way to call I_to_LEbytes. Index: bdb.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/berkeley-db/bdb.c,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- bdb.c 14 May 2005 13:45:38 -0000 1.86 +++ bdb.c 7 Jun 2005 11:21:36 -0000 1.87 @@ -1040,8 +1040,7 @@ } key->ulen = key->size = bytesize; key->data = my_malloc(bytesize); - begin_system_call(); memset(key->data,0,bytesize); end_system_call(); - if (I_to_LEbytes(obj,bitsize,(uintB*)key->data)) + if (I_to_LEbytes(obj,8*bytesize,(uintB*)key->data)) NOTREACHED; /* there must not be an overflow! */ # if defined(DEBUG) ASSERT(eql(LEbytes_to_I(bytesize,(uintB*)key->data),obj)); --__--__-- Message: 7 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src win32.d,1.58,1.59 ChangeLog,1.4689,1.4690 Date: Tue, 07 Jun 2005 11:30:19 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4359 Modified Files: win32.d ChangeLog Log Message: On mingw, include <io.h> early enough. Index: win32.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/win32.d,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- win32.d 7 Jun 2005 11:00:31 -0000 1.58 +++ win32.d 7 Jun 2005 11:30:14 -0000 1.59 @@ -233,6 +233,7 @@ #undef SIZEOF_OFF_T /* on mingw, it was defined in unixconf.h */ #define SIZEOF_OFF_T 8 #ifdef __MINGW32__ + #include <io.h> #define lseek clisp_lseek /* avoid collision with prototype in <mingw/io.h> */ #endif extern off_t lseek (HANDLE fd, off_t offset, DWORD mode); @@ -340,6 +341,7 @@ /* Hacking the terminal */ #ifdef __MINGW32__ + # include <io.h> #define isatty clisp_isatty /* avoid collision with prototype in <mingw/io.h> */ #endif extern int isatty (HANDLE handle); /* see win32aux.d */ Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4689 retrieving revision 1.4690 diff -u -d -r1.4689 -r1.4690 --- ChangeLog 7 Jun 2005 11:21:36 -0000 1.4689 +++ ChangeLog 7 Jun 2005 11:30:14 -0000 1.4690 @@ -1,3 +1,7 @@ +2005-06-07 Bruno Haible <br...@cl...> + + * win32.d [MINGW]: Include <io.h> before redefining lseek, isatty. + 2005-06-06 Bruno Haible <br...@cl...> * modules/berkeley-db/bdb.c (fill_dbt): Call I_to_LEbytes differently, --__--__-- Message: 8 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/queued patch01,NONE,1.1 patch02,NONE,1.1 Date: Tue, 07 Jun 2005 11:53:33 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/queued In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17517 Added Files: patch01 patch02 Log Message: For after 2.34. --- NEW FILE: patch01 --- 2005-04-21 Bruno Haible <br...@cl...> Fix POSIX::CONVERT-MODE. * utils/modprep.lisp (to-C-name): Don't insert an underscore after the prefix or before the suffix. * i18n/gettext.c (check_locale_category): Append an underscore to the prefix. * rawsock/rawsock.c (check_socket_domain, check_socket_type, check_socket_protocol): Likewise. * berkeley-db/bdb.c (dbe_encryption_check, check_lk_detect, db_get_action, db_put_action, dbc_get_action, dbc_put_flag, check_lockmode, logc_get_action, txn_check_sync, txn_timeout_check): Likewise. * syscalls/calls.c (check_syslog_severity, check_syslog_facility, check_priority_value, check_priority_which, sysconf_arg, confstr_arg, getrlimit_arg, mknod_type_check): Likewise. (check_chmod_mode): Use prefix S_I. *** clisp-20050316/utils/modprep.lisp.bak Tue Mar 15 13:01:09 2005 --- clisp-20050316/utils/modprep.lisp Thu Apr 21 19:46:43 2005 *************** *** 62,68 **** else { for (index = 0; index < c_name_table_size; index++) if (eq(a,*c_name_table[index].l_const)) ! return c-name_table[index].c_const; pushSTACK(NIL); pushSTACK(arg); pushSTACK(the_appropriate_error_type); pushSTACK(the_appropriate_error_type); pushSTACK(arg); --- 62,68 ---- else { for (index = 0; index < c_name_table_size; index++) if (eq(a,*c_name_table[index].l_const)) ! return c_name_table[index].c_const; pushSTACK(NIL); pushSTACK(arg); pushSTACK(the_appropriate_error_type); pushSTACK(the_appropriate_error_type); pushSTACK(arg); *************** *** 625,632 **** (etypecase name (string (setq name (substitute #\_ #\- name)) ! (when prefix (setq name (ext:string-concat prefix "_" name))) ! (when suffix (setq name (ext:string-concat name "_" suffix)))) (cons (setq name (second name)))) name) (defun new-checker (name cpp-names &key type prefix suffix reverse default enum --- 625,632 ---- (etypecase name (string (setq name (substitute #\_ #\- name)) ! (when prefix (setq name (ext:string-concat prefix name))) ! (when suffix (setq name (ext:string-concat name suffix)))) (cons (setq name (second name)))) name) (defun new-checker (name cpp-names &key type prefix suffix reverse default enum *** clisp-20050316/modules/i18n/gettext.c.bak Tue Mar 1 12:09:14 2005 --- clisp-20050316/modules/i18n/gettext.c Thu Apr 21 19:49:33 2005 *************** *** 28,34 **** DEFMODULE(i18n,"I18N") /* Returns the <locale.h> value corresponding to a LC_... constant. */ ! DEFCHECKER(check_locale_category,prefix=LC,default=LC_MESSAGES, \ ALL COLLATE CTYPE MESSAGES MONETARY NUMERIC TIME \ PAPER NAME ADDRESS TELEPHONE MEASUREMENT IDENTIFICATION) --- 28,34 ---- DEFMODULE(i18n,"I18N") /* Returns the <locale.h> value corresponding to a LC_... constant. */ ! DEFCHECKER(check_locale_category,prefix=LC_,default=LC_MESSAGES, \ ALL COLLATE CTYPE MESSAGES MONETARY NUMERIC TIME \ PAPER NAME ADDRESS TELEPHONE MEASUREMENT IDENTIFICATION) *** clisp-20050316/modules/syscalls/calls.c.bak Thu Apr 21 19:36:15 2005 --- clisp-20050316/modules/syscalls/calls.c Thu Apr 21 19:48:45 2005 *************** *** 177,185 **** /* ============================== syslog ============================== */ #if defined(HAVE_SYSLOG) ! DEFCHECKER(check_syslog_severity,prefix=LOG,reverse=sint_to_I, \ EMERG ALERT CRIT ERR WARNING NOTICE INFO DEBUG) ! DEFCHECKER(check_syslog_facility,default=LOG_USER,prefix=LOG,\ KERN USER MAIL NEWS UUCP DAEMON AUTH CRON LPR SYSLOG AUTHPRIV FTP \ LOCAL0 LOCAL1 LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7) DEFFLAGSET(syslog_opt_flags,LOG_PID LOG_CONS LOG_NDELAY LOG_ODELAY LOG_NOWAIT) --- 177,185 ---- /* ============================== syslog ============================== */ #if defined(HAVE_SYSLOG) ! DEFCHECKER(check_syslog_severity,prefix=LOG_,reverse=sint_to_I, \ EMERG ALERT CRIT ERR WARNING NOTICE INFO DEBUG) ! DEFCHECKER(check_syslog_facility,default=LOG_USER,prefix=LOG_,\ KERN USER MAIL NEWS UUCP DAEMON AUTH CRON LPR SYSLOG AUTHPRIV FTP \ LOCAL0 LOCAL1 LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7) DEFFLAGSET(syslog_opt_flags,LOG_PID LOG_CONS LOG_NDELAY LOG_ODELAY LOG_NOWAIT) *************** *** 226,239 **** /* ========================== process priority ========================== */ #if defined(WIN32_NATIVE) ! DEFCHECKER(check_priority_value,suffix=PRIORITY_CLASS,default=0, \ REALTIME HIGH ABOVE-NORMAL NORMAL BELOW-NORMAL LOW IDLE) #else DEFCHECKER(check_priority_value,default=0,reverse=sint_to_I, \ REALTIME=-NZERO HIGH=(-NZERO/2) ABOVE-NORMAL=(-NZERO/4) NORMAL=0 \ BELOW-NORMAL=(NZERO/4) LOW=(NZERO/2) IDLE=NZERO) #endif ! DEFCHECKER(check_priority_which,prefix=PRIO,default=0, PROCESS PGRP USER) DEFUN(OS:PRIORITY, pid &optional which) { int which = check_priority_which(popSTACK()); int pid = posfixnum_to_L(check_posfixnum(popSTACK())); --- 226,239 ---- /* ========================== process priority ========================== */ #if defined(WIN32_NATIVE) ! DEFCHECKER(check_priority_value,suffix=_PRIORITY_CLASS,default=0, \ REALTIME HIGH ABOVE-NORMAL NORMAL BELOW-NORMAL LOW IDLE) #else DEFCHECKER(check_priority_value,default=0,reverse=sint_to_I, \ REALTIME=-NZERO HIGH=(-NZERO/2) ABOVE-NORMAL=(-NZERO/4) NORMAL=0 \ BELOW-NORMAL=(NZERO/4) LOW=(NZERO/2) IDLE=NZERO) #endif ! DEFCHECKER(check_priority_which,prefix=PRIO_,default=0, PROCESS PGRP USER) DEFUN(OS:PRIORITY, pid &optional which) { int which = check_priority_which(popSTACK()); int pid = posfixnum_to_L(check_posfixnum(popSTACK())); *************** *** 468,474 **** #endif /* HAVE_UNAME */ #if defined(HAVE_SYSCONF) ! DEFCHECKER(sysconf_arg,prefix=_SC,default=, \ AIO-LISTIO-MAX AIO-MAX AIO-PRIO-DELTA-MAX \ ARG-MAX ATEXIT-MAX BC-BASE-MAX BC-DIM-MAX BC-SCALE-MAX \ BC-STRING-MAX CHILD-MAX CLK-TCK COLL-WEIGHTS-MAX DELAYTIMER-MAX \ --- 468,474 ---- #endif /* HAVE_UNAME */ #if defined(HAVE_SYSCONF) ! DEFCHECKER(sysconf_arg,prefix=_SC_,default=, \ AIO-LISTIO-MAX AIO-MAX AIO-PRIO-DELTA-MAX \ ARG-MAX ATEXIT-MAX BC-BASE-MAX BC-DIM-MAX BC-SCALE-MAX \ BC-STRING-MAX CHILD-MAX CLK-TCK COLL-WEIGHTS-MAX DELAYTIMER-MAX \ *************** *** 522,528 **** #endif /* HAVE_SYSCONF */ #if defined(HAVE_CONFSTR) ! DEFCHECKER(confstr_arg,prefix=_CS,PATH POSIX-V6-ILP32-OFF32-CFLAGS \ POSIX-V6-ILP32-OFF32-LDFLAGS POSIX-V6-ILP32-OFF32-LIBS \ POSIX-V6-ILP32-OFFBIG-CFLAGS POSIX-V6-ILP32-OFFBIG-LDFLAGS \ POSIX-V6-ILP32-OFFBIG-LIBS POSIX-V6-LP64-OFF64-CFLAGS \ --- 522,528 ---- #endif /* HAVE_SYSCONF */ #if defined(HAVE_CONFSTR) ! DEFCHECKER(confstr_arg,prefix=_CS_,PATH POSIX-V6-ILP32-OFF32-CFLAGS \ POSIX-V6-ILP32-OFF32-LDFLAGS POSIX-V6-ILP32-OFF32-LIBS \ POSIX-V6-ILP32-OFFBIG-CFLAGS POSIX-V6-ILP32-OFFBIG-LDFLAGS \ POSIX-V6-ILP32-OFFBIG-LIBS POSIX-V6-LP64-OFF64-CFLAGS \ *************** *** 615,621 **** #endif /* HAVE_GETRUSAGE */ #if defined(HAVE_GETRLIMIT) ! DEFCHECKER(getrlimit_arg,prefix=RLIMIT, CPU FSIZE DATA STACK CORE RSS NOFILE \ AS NPROC MEMLOCK LOCKS) DEFUN(POSIX::RLIMIT, &optional what) { /* getrlimit(3) */ --- 615,621 ---- #endif /* HAVE_GETRUSAGE */ #if defined(HAVE_GETRLIMIT) ! DEFCHECKER(getrlimit_arg,prefix=RLIMIT_, CPU FSIZE DATA STACK CORE RSS NOFILE \ AS NPROC MEMLOCK LOCKS) DEFUN(POSIX::RLIMIT, &optional what) { /* getrlimit(3) */ *************** *** 1028,1034 **** #endif /* chmod chown utime */ /* <http://www.opengroup.org/onlinepubs/009695399/basedefs/sys/stat.h.html> */ ! DEFCHECKER(check_chmod_mode,prefix=S_,default=, SUID SGID SVTX \ RWXU RUSR WUSR XUSR RWXG RGRP WGRP XGRP RWXO ROTH WOTH XOTH) DEFUN(POSIX::CONVERT-MODE, mode) --- 1028,1034 ---- #endif /* chmod chown utime */ /* <http://www.opengroup.org/onlinepubs/009695399/basedefs/sys/stat.h.html> */ ! DEFCHECKER(check_chmod_mode,prefix=S_I,default=, SUID SGID SVTX \ RWXU RUSR WUSR XUSR RWXG RGRP WGRP XGRP RWXO ROTH WOTH XOTH) DEFUN(POSIX::CONVERT-MODE, mode) *************** *** 1075,1081 **** #endif /* umask */ #if defined(HAVE_MKNOD) ! DEFCHECKER(mknod_type_check,prefix=S,default=, \ IFIFO IFSOCK IFCHR IFDIR IFBLK IFREG) DEFUN(POSIX::MKNOD, path type mode) { /* lisp interface to mknod(2) --- 1075,1081 ---- #endif /* umask */ #if defined(HAVE_MKNOD) ! DEFCHECKER(mknod_type_check,prefix=S_,default=, \ IFIFO IFSOCK IFCHR IFDIR IFBLK IFREG) DEFUN(POSIX::MKNOD, path type mode) { /* lisp interface to mknod(2) *** clisp-20050316/modules/rawsock/rawsock.c.bak Fri Feb 18 19:24:35 2005 --- clisp-20050316/modules/rawsock/rawsock.c Thu Apr 21 19:49:13 2005 *************** *** 210,224 **** } /* ================== sys/socket.h interface ================== */ ! DEFCHECKER(check_socket_domain,prefix=AF,default=AF_UNSPEC, \ UNSPEC UNIX LOCAL INET AX25 \ IPX APPLETALK NETROM BRIDGE ATMPVC X25 INET6 \ ROSE DECnet NETBEUI SECURITY KEY NETLINK \ ROUTE PACKET ASH ECONET ATMSVC SNA IRDA \ PPPOX WANPIPE BLUETOOTH) ! DEFCHECKER(check_socket_type,prefix=SOCK,default=SOCK_STREAM, \ STREAM DGRAM RAW RDM SEQPACKET PACKET) ! DEFCHECKER(check_socket_protocol,prefix=ETH_P, default=0, \ LOOP PUP PUPAT IP X25 ARP BPQ \ IEEEPUP IEEEPUPAT DEC DNA-DL DNA-RC DNA-RT LAT DIAG CUST SCA \ RARP ATALK AARP IPX IPV6 PPP-DISC PPP-SES ATMMPOA ATMFATE 802-3 \ --- 210,224 ---- } /* ================== sys/socket.h interface ================== */ ! DEFCHECKER(check_socket_domain,prefix=AF_,default=AF_UNSPEC, \ UNSPEC UNIX LOCAL INET AX25 \ IPX APPLETALK NETROM BRIDGE ATMPVC X25 INET6 \ ROSE DECnet NETBEUI SECURITY KEY NETLINK \ ROUTE PACKET ASH ECONET ATMSVC SNA IRDA \ PPPOX WANPIPE BLUETOOTH) ! DEFCHECKER(check_socket_type,prefix=SOCK_,default=SOCK_STREAM, \ STREAM DGRAM RAW RDM SEQPACKET PACKET) ! DEFCHECKER(check_socket_protocol,prefix=ETH_P_, default=0, \ LOOP PUP PUPAT IP X25 ARP BPQ \ IEEEPUP IEEEPUPAT DEC DNA-DL DNA-RC DNA-RT LAT DIAG CUST SCA \ RARP ATALK AARP IPX IPV6 PPP-DISC PPP-SES ATMMPOA ATMFATE 802-3 \ *** clisp-20050316/modules/berkeley-db/bdb.c.bak Fri Feb 18 19:23:16 2005 --- clisp-20050316/modules/berkeley-db/bdb.c Thu Apr 21 19:50:41 2005 *************** *** 184,190 **** DB_ENV->errx Error message */ ! DEFCHECKER(dbe_encryption_check, prefix=DB_ENCRYPT, default=DB_ENCRYPT_AES, \ AES) /* set the password to perform encryption and decryption. can trigger GC */ --- 184,190 ---- DB_ENV->errx Error message */ ! DEFCHECKER(dbe_encryption_check, prefix=DB_ENCRYPT_, default=DB_ENCRYPT_AES, \ AES) /* set the password to perform encryption and decryption. can trigger GC */ *************** *** 437,443 **** static void set_verbose (DB_ENV *dbe, object arg, u_int32_t flag) { if (boundp(arg)) SYSCALL(dbe->set_verbose,(dbe,flag,!nullp(arg))); } ! DEFCHECKER(check_lk_detect,prefix=DB_LOCK, default=DB_LOCK_DEFAULT, \ DEFAULT EXPIRE MAXLOCKS MINLOCKS MINWRITE OLDEST RANDOM YOUNGEST) DEFUN(BDB:DBE-SET-OPTIONS, dbe &key \ :ERRFILE :ERRPFX :PASSWORD :ENCRYPT :LOCK_TIMEOUT :TXN_TIMEOUT :TIMEOUT \ --- 437,443 ---- static void set_verbose (DB_ENV *dbe, object arg, u_int32_t flag) { if (boundp(arg)) SYSCALL(dbe->set_verbose,(dbe,flag,!nullp(arg))); } ! DEFCHECKER(check_lk_detect,prefix=DB_LOCK_, default=DB_LOCK_DEFAULT, \ DEFAULT EXPIRE MAXLOCKS MINLOCKS MINWRITE OLDEST RANDOM YOUNGEST) DEFUN(BDB:DBE-SET-OPTIONS, dbe &key \ :ERRFILE :ERRPFX :PASSWORD :ENCRYPT :LOCK_TIMEOUT :TXN_TIMEOUT :TIMEOUT \ *************** *** 1092,1098 **** VALUES1(fixnum(fd)); } ! DEFCHECKER(db_get_action,prefix=DB, default=DB_CONSUME, \ CONSUME CONSUME-WAIT GET-BOTH SET-RECNO) DEFFLAGSET(db_get_options, DB_AUTO_COMMIT DB_DIRTY_READ DB_MULTIPLE DB_RMW) DEFUN(BDB:DB-GET, db key &key :ACTION :AUTO_COMMIT :DIRTY_READ :MULTIPLE :RMW \ --- 1092,1098 ---- VALUES1(fixnum(fd)); } ! DEFCHECKER(db_get_action,prefix=DB_, default=DB_CONSUME, \ CONSUME CONSUME-WAIT GET-BOTH SET-RECNO) DEFFLAGSET(db_get_options, DB_AUTO_COMMIT DB_DIRTY_READ DB_MULTIPLE DB_RMW) DEFUN(BDB:DB-GET, db key &key :ACTION :AUTO_COMMIT :DIRTY_READ :MULTIPLE :RMW \ *************** *** 1302,1308 **** VALUES0; skipSTACK(3); } ! DEFCHECKER(db_put_action,prefix=DB, default=DB_APPEND, \ APPEND NODUPDATA NOOVERWRITE) DEFFLAGSET(db_put_flags, DB_AUTO_COMMIT) DEFUN(BDB:DB-PUT, db key val &key :AUTO_COMMIT :ACTION :TRANSACTION) --- 1302,1308 ---- VALUES0; skipSTACK(3); } ! DEFCHECKER(db_put_action,prefix=DB_, default=DB_APPEND, \ APPEND NODUPDATA NOOVERWRITE) DEFFLAGSET(db_put_flags, DB_AUTO_COMMIT) DEFUN(BDB:DB-PUT, db key val &key :AUTO_COMMIT :ACTION :TRANSACTION) *************** *** 1789,1795 **** return check_dbt_type(datum); } else return fill_dbt(datum,pdbt,re_len); /* datum */ } ! DEFCHECKER(dbc_get_action,prefix=DB,default=DB_CURRENT, \ CURRENT FIRST GET-BOTH GET-BOTH-RANGE GET-RECNO JOIN-ITEM LAST \ NEXT NEXT-DUP NEXT-NODUP PREV PREV-NODUP SET SET-RANGE SET-RECNO) DEFFLAGSET(dbc_get_options, DB_DIRTY_READ DB_MULTIPLE DB_MULTIPLE_KEY DB_RMW) --- 1789,1795 ---- return check_dbt_type(datum); } else return fill_dbt(datum,pdbt,re_len); /* datum */ } ! DEFCHECKER(dbc_get_action,prefix=DB_,default=DB_CURRENT, \ CURRENT FIRST GET-BOTH GET-BOTH-RANGE GET-RECNO JOIN-ITEM LAST \ NEXT NEXT-DUP NEXT-NODUP PREV PREV-NODUP SET SET-RANGE SET-RECNO) DEFFLAGSET(dbc_get_options, DB_DIRTY_READ DB_MULTIPLE DB_MULTIPLE_KEY DB_RMW) *************** *** 1824,1830 **** mv_count = 2; } ! DEFCHECKER(dbc_put_flag,prefix=DB, default=DB_CURRENT, \ CURRENT AFTER BEFORE KEYFIRST KEYLAST NODUPDATA) DEFUN(BDB:DBC-PUT, cursor key data flag) { /* retrieve key/data pairs from the database */ --- 1824,1830 ---- mv_count = 2; } ! DEFCHECKER(dbc_put_flag,prefix=DB_, default=DB_CURRENT, \ CURRENT AFTER BEFORE KEYFIRST KEYLAST NODUPDATA) DEFUN(BDB:DBC-PUT, cursor key data flag) { /* retrieve key/data pairs from the database */ *************** *** 1855,1861 **** VALUES_IF(aborted); } ! DEFCHECKER(check_lockmode, enum=db_lockmode_t, prefix=DB_LOCK, default=, \ NG READ WRITE WAIT IWRITE IREAD IWR DIRTY WWRITE) DEFFLAGSET(lock_get_flags, DB_LOCK_NOWAIT) DEFUN(BDB:LOCK-GET, dbe object locker mode &key :NOWAIT) --- 1855,1861 ---- VALUES_IF(aborted); } ! DEFCHECKER(check_lockmode, enum=db_lockmode_t, prefix=DB_LOCK_, default=, \ NG READ WRITE WAIT IWRITE IREAD IWR DIRTY WWRITE) DEFFLAGSET(lock_get_flags, DB_LOCK_NOWAIT) DEFUN(BDB:LOCK-GET, dbe object locker mode &key :NOWAIT) *************** *** 2079,2085 **** } else { skipSTACK(1); VALUES1(NIL); } } ! DEFCHECKER(logc_get_action,prefix=DB,default=DB_CURRENT, \ CURRENT FIRST LAST NEXT PREV) DEFUN(BDB:LOGC-GET, logc action &key :TYPE :ERROR) { /* return records from the log. */ --- 2079,2085 ---- } else { skipSTACK(1); VALUES1(NIL); } } ! DEFCHECKER(logc_get_action,prefix=DB_,default=DB_CURRENT, \ CURRENT FIRST LAST NEXT PREV) DEFUN(BDB:LOGC-GET, logc action &key :TYPE :ERROR) { /* return records from the log. */ *************** *** 2154,2160 **** } else { skipSTACK(1); VALUES1(NIL); } } ! DEFCHECKER(txn_check_sync,prefix=DB_TXN,default=DB_TXN_NOSYNC, NOSYNC SYNC) DEFUN(BDB:TXN-COMMIT, txn &key :SYNC) { /* Commit a transaction */ u_int32_t flags = txn_check_sync(popSTACK()); --- 2154,2160 ---- } else { skipSTACK(1); VALUES1(NIL); } } ! DEFCHECKER(txn_check_sync,prefix=DB_TXN_,default=DB_TXN_NOSYNC, NOSYNC SYNC) DEFUN(BDB:TXN-COMMIT, txn &key :SYNC) { /* Commit a transaction */ u_int32_t flags = txn_check_sync(popSTACK()); *************** *** 2255,2261 **** VALUES1(listof(retnum)); } ! DEFCHECKER(txn_timeout_check,prefix=DB_SET,default=, LOCK-TIMEOUT TXN-TIMEOUT) DEFUN(BDB:TXN-SET-TIMEOUT, txn timeout which) { /* set timeout values for locks or transactions for the specified transaction */ --- 2255,2261 ---- VALUES1(listof(retnum)); } ! DEFCHECKER(txn_timeout_check,prefix=DB_SET_,default=, LOCK-TIMEOUT TXN-TIMEOUT) DEFUN(BDB:TXN-SET-TIMEOUT, txn timeout which) { /* set timeout values for locks or transactions for the specified transaction */ --- NEW FILE: patch02 --- Not sure whether this has bad side effects. 2005-06-06 Bruno Haible <br...@cl...> * makemake.in (MODULES): Don't use with_module_* variables any more. *** clisp-20050527/src/makemake.in.bak 2005-06-04 21:10:49.000000000 +0200 --- clisp-20050527/src/makemake.in 2005-06-07 02:34:44.000000000 +0200 *************** *** 1870,1876 **** if [ $TOS = unix ] ; then echol "# clx/new-clx faster X11 interface (replaces clx/mit-clx)" fi ! echol "MODULES = ${MODULES} "`set | grep '^with_module_' | sed -e 's,^with_module_,,' -e 's,=.*$,,'` echol echol "# Command line options passed to the configure files of add-on modules" echol "MODULE_CONFIGURE_FLAGS =${module_configure_flags}" --- 1880,1886 ---- if [ $TOS = unix ] ; then echol "# clx/new-clx faster X11 interface (replaces clx/mit-clx)" fi ! echol "MODULES = ${MODULES}" echol echol "# Command line options passed to the configure files of add-on modules" echol "MODULE_CONFIGURE_FLAGS =${module_configure_flags}" --__--__-- Message: 9 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src ChangeLog,1.4690,1.4691 Date: Tue, 07 Jun 2005 11:55:32 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18550/src Modified Files: ChangeLog Log Message: Don't distribute queued/. Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4690 retrieving revision 1.4691 diff -u -d -r1.4690 -r1.4691 --- ChangeLog 7 Jun 2005 11:30:14 -0000 1.4690 +++ ChangeLog 7 Jun 2005 11:55:27 -0000 1.4691 @@ -1,5 +1,9 @@ 2005-06-07 Bruno Haible <br...@cl...> + * Makefile.devel (EXCLUDE): Exclude also the 'queued' directory. + +2005-06-07 Bruno Haible <br...@cl...> + * win32.d [MINGW]: Include <io.h> before redefining lseek, isatty. 2005-06-06 Bruno Haible <br...@cl...> --__--__-- Message: 10 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp Makefile.devel,1.130,1.131 Date: Tue, 07 Jun 2005 11:55:29 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18550 Modified Files: Makefile.devel Log Message: Don't distribute queued/. Index: Makefile.devel =================================================================== RCS file: /cvsroot/clisp/clisp/Makefile.devel,v retrieving revision 1.130 retrieving revision 1.131 diff -u -d -r1.130 -r1.131 --- Makefile.devel 3 Jun 2005 14:41:18 -0000 1.130 +++ Makefile.devel 7 Jun 2005 11:55:26 -0000 1.131 @@ -26,7 +26,7 @@ EXCLUDE=--exclude CVS --exclude \*.fas --exclude \*.lib --exclude \*.obj \ --exclude \*.exe --exclude \*.mem --exclude \*.o --exclude build \ --exclude .cvsignore --exclude \*~ --exclude .\#\* \ - --exclude $(AUTOCONF_CACHE) --exclude tmp \ + --exclude $(AUTOCONF_CACHE) --exclude tmp --exclude queued \ `sed "s/^/--exclude /" doc/.cvsignore` \ --exclude TAGS --exclude \*.elc --exclude \*.orig --exclude \*.rej --__--__-- Message: 11 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src/autoconf aclocal.m4,1.150,1.151 Date: Tue, 07 Jun 2005 12:18:37 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29926/src/autoconf Modified Files: aclocal.m4 Log Message: Regenerated. Index: aclocal.m4 =================================================================== RCS file: /cvsroot/clisp/clisp/src/autoconf/aclocal.m4,v retrieving revision 1.150 retrieving revision 1.151 diff -u -d -r1.150 -r1.151 --- aclocal.m4 1 Jun 2005 11:30:47 -0000 1.150 +++ aclocal.m4 7 Jun 2005 12:18:34 -0000 1.151 @@ -210,6 +210,49 @@ AC_DEFINE_UNQUOTED(STACK_ADDRESS_RANGE,$x,[address range of the C stack]) ]) +# alloca.m4 serial 5 +dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_ALLOCA], +[ + dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. + AC_REQUIRE([AC_PROG_CPP]) + AC_REQUIRE([AC_PROG_EGREP]) + + AC_REQUIRE([AC_FUNC_ALLOCA]) + if test $ac_cv_func_alloca_works = no; then + gl_PREREQ_ALLOCA + fi + + # Define an additional variable used in the Makefile substitution. + if test $ac_cv_working_alloca_h = yes; then + AC_EGREP_CPP([Need own alloca], [ +#if defined __GNUC__ || defined _AIX || defined _MSC_VER + Need own alloca +#endif + ], + [AC_DEFINE(HAVE_ALLOCA, 1, + [Define to 1 if you have `alloca' after including <alloca.h>, + a header that may be supplied by this distribution.]) + ALLOCA_H=alloca.h], + [ALLOCA_H=]) + else + ALLOCA_H=alloca.h + fi + AC_SUBST([ALLOCA_H]) + + AC_DEFINE(HAVE_ALLOCA_H, 1, + [Define HAVE_ALLOCA_H for backward compatibility with older code + that includes <alloca.h> only if HAVE_ALLOCA_H is defined.]) +]) + +# Prerequisites of lib/alloca.c. +# STACK_DIRECTION is already handled by AC_FUNC_ALLOCA. +AC_DEFUN([gl_PREREQ_ALLOCA], [:]) + dnl -*- Autoconf -*- dnl Copyright (C) 1993-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU @@ -11577,6 +11620,45 @@ fi fi]) +#serial 1003 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# This macro can be removed once we can rely on Autoconf 2.57a or later, +# since we can then use its AC_C_RESTRICT. + +# gl_C_RESTRICT +# -------------- +# Determine whether the C/C++ compiler supports the "restrict" keyword +# introduced in ANSI C99, or an equivalent. Do nothing if the compiler +# accepts it. Otherwise, if the compiler supports an equivalent, +# define "restrict" to be that. Here are some variants: +# - GCC supports both __restrict and __restrict__ +# - older DEC Alpha C compilers support only __restrict +# - _Restrict is the only spelling accepted by Sun WorkShop 6 update 2 C +# Otherwise, define "restrict" to be empty. +AC_DEFUN([gl_C_RESTRICT], +[AC_CACHE_CHECK([for C/C++ restrict keyword], gl_cv_c_restrict, + [gl_cv_c_restrict=no + # Try the official restrict keyword, then gcc's __restrict, and + # the less common variants. + for ac_kw in restrict __restrict __restrict__ _Restrict; do + AC_COMPILE_IFELSE([AC_LANG_SOURCE( + [float * $ac_kw x;])], + [gl_cv_c_restrict=$ac_kw; break]) + done + ]) + case $gl_cv_c_restrict in + restrict) ;; + no) AC_DEFINE(restrict,, + [Define to equivalent of C99 restrict keyword, or to nothing if this + is not supported. Do not define if restrict is supported directly.]) ;; + *) AC_DEFINE_UNQUOTED(restrict, $gl_cv_c_restrict) ;; + esac +]) + dnl -*- Autoconf -*- dnl Copyright (C) 1993-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU --__--__-- _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest |