Menu
▾
▴
clisp-devel
|
From: Sam S. <sd...@gn...> - 2008-05-28 19:02:09
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 1. longdouble.m4 claims to come from gettext. why isn't it in gnulib if it is used by two packages already? 2. clisp never uses any long doubles - why does it need all the testing infrastructure? 3. on many occasions you use AC_MSG_CHECKING+AC_CACHE_VAL instead of AC_CACHE_CHECK - why? thanks. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIPawjPp1Qsf2qnMcRAkJyAKCei+MLWH0nN00PhO3F/2S5AquohQCdFKeQ DehjV0pUdPL5jBnj5VgpX7A= =mqJO -----END PGP SIGNATURE----- |
|
From: Bruno H. <br...@cl...> - 2008-05-28 22:26:04
|
Sam wrote: > 1. longdouble.m4 claims to come from gettext. why isn't it in gnulib if > it is used by two packages already? longdouble.m4 was removed from gnulib and gettext on 2007-04-06. 'long double' is no longer a portability problem per se: all compilers support this type. Instead of testing HAVE_LONG_DOUBLE, we now simply assume the 'long double' type. Nobody reported a problem about it in a year. > 2. clisp never uses any long doubles - why does it need all the testing > infrastructure? It doesn't need it any more. > 3. on many occasions you use AC_MSG_CHECKING+AC_CACHE_VAL instead of > AC_CACHE_CHECK - why? In many places one can use AC_CACHE_CHECK, indeed. (Like you can use 'prog' instead of 'let' and 'tagbody'.) In other places, like CL_PROG_LN_S, it's separate because I chose to print a message result that is different from the cache variable. You can rewrite that, of course: AC_MSG_CHECKING(whether ln -s works) AC_CACHE_VAL(cl_cv_prog_LN_S, [ rm -f conftestdata if ln -s X conftestdata 2>/dev/null; then cl_cv_prog_LN_S="ln -s" else cl_cv_prog_LN_S="$cl_cv_prog_LN" fi rm -f conftestdata ])dnl if test "$cl_cv_prog_LN_S" = "ln -s"; then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi LN_S="$cl_cv_prog_LN_S" could be rewritten as AC_MSG_CHECKING(whether ln -s works) AC_CACHE_VAL(cl_cv_prog_LN_S_works, [ rm -f conftestdata if ln -s X conftestdata 2>/dev/null; then cl_cv_prog_LN_S_works=yes else cl_cv_prog_LN_S_works=no fi rm -f conftestdata ])dnl AC_MSG_RESULT($cl_cv_prog_LN_S_works) if test $cl_cv_prog_LN_S_works = yes; then LN_S="ln -s" else LN_S="$cl_cv_prog_LN" fi and finally be simplified to AC_CACHE_CHECK([whether ln -s works], [cl_cv_prog_LN_S_works], [ rm -f conftestdata if ln -s X conftestdata 2>/dev/null; then cl_cv_prog_LN_S_works=yes else cl_cv_prog_LN_S_works=no fi rm -f conftestdata ])dnl if test $cl_cv_prog_LN_S_works = yes; then LN_S="ln -s" else LN_S="$cl_cv_prog_LN" fi Bruno |
|
From: Sam S. <sd...@gn...> - 2008-05-29 19:21:28
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Bruno, thanks for your replies. Another question: why isn't AC_HEADER_DIRENT sufficient? Thanks. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIPv0wPp1Qsf2qnMcRAuX/AJ9c0FY/Tc02n+5f9LyFyqsY1NQjtACfTA7J keBUPovBR8nVxeN67J53HxM= =4lgq -----END PGP SIGNATURE----- |
|
From: Bruno H. <br...@cl...> - 2008-05-29 22:20:40
|
Sam wrote:
> Another question: why isn't AC_HEADER_DIRENT sufficient?
Even AC_HEADER_DIRENT is not needed any more, nowadays (and already for
more than 5 years, probably even for 10 years). dir.m4 is gone:
2008-05-29 Bruno Haible <br...@cl...>
* configure.in: Remove CL_DIR_HEADER invocation.
* m4/dir.m4: Remove file.
* m4/closedir.m4 (CL_CLOSEDIR): Assume <dirent.h>.
* m4/filecharset.m4 (CL_FILECHARSET): Likewise.
* unix.d: Likewise.
(SDIRENT): Remove macro.
* pathname.d (directory_search_scandir): Assume <dirent.h> and
struct dirent.
*** m4/closedir.m4 5 Sep 2003 14:40:52 -0000 1.4
--- m4/closedir.m4 29 May 2008 22:14:06 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2008 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
***************
*** 11,18 ****
AC_PREREQ(2.13)
AC_DEFUN([CL_CLOSEDIR],
! [AC_REQUIRE([CL_DIR_HEADER])dnl
! AC_BEFORE([$0], [CL_FILECHARSET])dnl
CL_PROTO([closedir], [
CL_PROTO_RET([
#include <stdlib.h>
--- 11,17 ----
AC_PREREQ(2.13)
AC_DEFUN([CL_CLOSEDIR],
! [AC_BEFORE([$0], [CL_FILECHARSET])dnl
CL_PROTO([closedir], [
CL_PROTO_RET([
#include <stdlib.h>
***************
*** 20,26 ****
#include <sys/types.h>
#include <unistd.h>
#endif
! #include <$ac_header_dirent>
], [int closedir (DIR* dir);], [int closedir();],
cl_cv_proto_closedir_ret, int, void)],
[extern $cl_cv_proto_closedir_ret closedir (DIR*);])
--- 19,25 ----
#include <sys/types.h>
#include <unistd.h>
#endif
! #include <dirent.h>
], [int closedir (DIR* dir);], [int closedir();],
cl_cv_proto_closedir_ret, int, void)],
[extern $cl_cv_proto_closedir_ret closedir (DIR*);])
***************
*** 38,44 ****
#include <unistd.h>
#endif
/* Declare opendir(), closedir(). */
! #include <$ac_header_dirent>
int main() { exit(closedir(opendir(".")) != 0); }],
cl_cv_func_closedir_retval=yes, cl_cv_func_closedir_retval=no,
# When cross-compiling, don't assume a return value.
--- 37,43 ----
#include <unistd.h>
#endif
/* Declare opendir(), closedir(). */
! #include <dirent.h>
int main() { exit(closedir(opendir(".")) != 0); }],
cl_cv_func_closedir_retval=yes, cl_cv_func_closedir_retval=no,
# When cross-compiling, don't assume a return value.
*** m4/filecharset.m4 27 May 2008 20:38:54 -0000 1.7
--- m4/filecharset.m4 29 May 2008 22:14:06 -0000
***************
*** 32,43 ****
#include <sys/file.h>
#endif
/* Declare opendir(), readdir(), closedir(). */
! #include <$ac_header_dirent>
! #ifdef DIRENT
! #define SDIRENT struct dirent
! #else
! #define SDIRENT struct direct
! #endif
/* A small program which checks for each character whether or not it is
* valid in filenames. */
#define N 256
--- 32,38 ----
#include <sys/file.h>
#endif
/* Declare opendir(), readdir(), closedir(). */
! #include <dirent.h>
/* A small program which checks for each character whether or not it is
* valid in filenames. */
#define N 256
***************
*** 68,74 ****
if (fd >=0)
{ DIR* dirp = opendir(".");
if (dirp != (DIR*)0)
! { SDIRENT* d;
while ((d = readdir(dirp)))
{ if (!strcmp(d->d_name,".")) continue;
if (!strcmp(d->d_name,"..")) continue;
--- 63,69 ----
if (fd >=0)
{ DIR* dirp = opendir(".");
if (dirp != (DIR*)0)
! { struct dirent * d;
while ((d = readdir(dirp)))
{ if (!strcmp(d->d_name,".")) continue;
if (!strcmp(d->d_name,"..")) continue;
*** configure.in 25 May 2008 09:11:41 -0000 1.135
--- configure.in 29 May 2008 22:14:07 -0000
***************
*** 86,92 ****
CL_OFFSETOF dnl DEFS HAVE_OFFSETOF if offsetof in stddef.h
CL_ACCESSFLAGS dnl DEFS ACCESS_NEEDS_SYS_FILE_H if sys/file.h is needed for the access() flags
CL_OPENFLAGS dnl DEFS OPEN_NEEDS_SYS_FILE_H if sys/file.h is needed for the open() flags
- CL_DIR_HEADER dnl directory reading functions
CL_UTSNAME dnl DEFS HAVE_SYS_UTSNAME_H
CL_SHM_H dnl DEFS HAVE_SYS_IPC_H, HAVE_SYS_SHM_H
CL_TERM dnl DEFS HAVE_TERMIOS_H, HAVE_TERMIO_H, ..., HAVE_SGTTY_H
--- 86,91 ----
*** unix.d 25 May 2008 09:11:40 -0000 1.81
--- unix.d 29 May 2008 22:14:07 -0000
***************
*** 405,429 ****
/* rename() - declared in <stdio.h>; used by PATHNAME, UNIXAUX */
/* directory search: */
! #if defined(DIRENT) || defined(_POSIX_VERSION)
! #include <dirent.h>
! #define SDIRENT struct dirent
! #else
! #ifdef SYSNDIR
! #include <sys/ndir.h>
! #else
! #ifdef SYSDIR
! #include <sys/dir.h>
! #else
! #ifdef NDIR
! #include <ndir.h>
! #else
! #include <dir.h>
! #endif
! #endif
! #endif
! #define SDIRENT struct direct
! #endif
/* declared in one of the above includes: opendir(), readdir(), closedir() */
#ifdef VOID_CLOSEDIR
#define CLOSEDIR(dirp) (closedir(dirp),0)
--- 405,411 ----
/* rename() - declared in <stdio.h>; used by PATHNAME, UNIXAUX */
/* directory search: */
! #include <dirent.h>
/* declared in one of the above includes: opendir(), readdir(), closedir() */
#ifdef VOID_CLOSEDIR
#define CLOSEDIR(dirp) (closedir(dirp),0)
*** pathname.d 2 May 2008 20:51:51 -0000 1.439
--- pathname.d 29 May 2008 22:14:11 -0000
***************
*** 1,6 ****
/*
* Pathnames for CLISP
! * Bruno Haible 1990-2005
* Logical Pathnames: Marcus Daniels 16.9.1994
* ANSI compliance, bugs: Sam Steingold 1998-2008
* German comments translated into English: Stefan Kain 2002-01-03
--- 1,6 ----
/*
* Pathnames for CLISP
! * Bruno Haible 1990-2008
* Logical Pathnames: Marcus Daniels 16.9.1994
* ANSI compliance, bugs: Sam Steingold 1998-2008
* German comments translated into English: Stefan Kain 2002-01-03
***************
*** 7056,7066 ****
else OS_file_error(STACK_1);
}
while (1) {
! var SDIRENT* dp;
begin_system_call();
errno = 0;
dp = readdir(dirp); /* fetch next directory-entry */
! if (dp == (SDIRENT*)NULL) { /* error or directory finished */
if (!(errno==0)) { end_system_call(); OS_file_error(STACK_1); }
end_system_call();
break;
--- 7056,7066 ----
else OS_file_error(STACK_1);
}
while (1) {
! var struct dirent * dp;
begin_system_call();
errno = 0;
dp = readdir(dirp); /* fetch next directory-entry */
! if (dp == (struct dirent *)NULL) { /* error or directory finished */
if (!(errno==0)) { end_system_call(); OS_file_error(STACK_1); }
end_system_call();
break;
|
|
From: Sam S. <sd...@gn...> - 2008-05-30 01:28:30
|
> * Bruno Haible <oe...@py...t> [2008-05-30 00:20:31 +0200]:
>
> Even AC_HEADER_DIRENT is not needed any more, nowadays (and already for
> more than 5 years, probably even for 10 years).
I wonder how many such macros we have in clisp/src/m4/...
'ls -lt clisp/src/m4/' will give you a bunch of filels 5+ years old:
4 -rw-rw-r-- 1 sds src 1836 Oct 2 2003 shm-rmid.m4
4 -rw-rw-r-- 1 sds src 1869 Oct 2 2003 shm.m4
4 -rw-rw-r-- 1 sds src 3623 Oct 2 2003 termios.m4
4 -rw-rw-r-- 1 sds src 1128 Aug 2 2003 abort.m4
4 -rw-rw-r-- 1 sds src 1244 Aug 2 2003 access.m4
4 -rw-rw-r-- 1 sds src 1224 Aug 2 2003 as-underscore.m4
4 -rw-rw-r-- 1 sds src 1162 Aug 2 2003 builtin_strlen.m4
4 -rw-rw-r-- 1 sds src 812 Aug 2 2003 caddr_t.m4
4 -rw-rw-r-- 1 sds src 1333 Aug 2 2003 cc-void.m4
4 -rw-rw-r-- 1 sds src 1209 Aug 2 2003 fpu_control.m4
4 -rw-rw-r-- 1 sds src 1312 Aug 2 2003 getpagesize.m4
4 -rw-rw-r-- 1 sds src 1554 Aug 2 2003 gettimeofday.m4
4 -rw-rw-r-- 1 sds src 677 Aug 2 2003 mach-vm.m4
4 -rw-rw-r-- 1 sds src 717 Aug 2 2003 offsetof.m4
4 -rw-rw-r-- 1 sds src 1312 Aug 2 2003 openflags.m4
4 -rw-rw-r-- 1 sds src 1014 Aug 2 2003 perror.m4
4 -rw-rw-r-- 1 sds src 672 Aug 2 2003 raise.m4
4 -rw-rw-r-- 1 sds src 815 Aug 2 2003 setjmp.m4
4 -rw-rw-r-- 1 sds src 695 Aug 2 2003 siginterrupt.m4
4 -rw-rw-r-- 1 sds src 1689 Aug 2 2003 times.m4
4 -rw-rw-r-- 1 sds src 899 Aug 2 2003 unixconn.m4
4 -rw-rw-r-- 1 sds src 735 Aug 2 2003 utsname.m4
4 -rw-rw-r-- 1 sds src 673 Aug 2 2003 vadvise.m4
4 -rw-rw-r-- 1 sds src 957 Aug 2 2003 waitpid.m4
4 -rw-rw-r-- 1 sds src 3280 Apr 29 2002 c++-constructors.m4
4 -rw-rw-r-- 1 sds src 821 Apr 29 2002 cc-cppaux.m4
4 -rw-rw-r-- 1 sds src 826 Apr 29 2002 cc-gcc.m4
4 -rw-rw-r-- 1 sds src 749 Apr 29 2002 cp.m4
4 -rw-rw-r-- 1 sds src 566 Apr 29 2002 msync.m4
4 -rw-rw-r-- 1 sds src 568 Apr 29 2002 munmap.m4
4 -rw-rw-r-- 1 sds src 1909 Apr 29 2002 socket.m4
4 -rw-rw-r-- 1 sds src 835 Apr 29 2002 sys-dynix.m4
4 -rw-rw-r-- 1 sds src 595 Apr 29 2002 sys-irix.m4
--
Sam Steingold (http://sds.podval.org/) on Fedora release 8 (Werewolf)
http://israelunderattack.slide.com http://palestinefacts.org http://camera.org
http://openvotingconsortium.org http://memri.org http://dhimmi.com
char*a="char*a=%c%s%c;main(){printf(a,34,a,34);}";main(){printf(a,34,a,34);}
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 11:34:48
|
Sam wrote: > > Even AC_HEADER_DIRENT is not needed any more, nowadays (and already for > > more than 5 years, probably even for 10 years). > > I wonder how many such macros we have in clisp/src/m4/... A lot of this testing is obsolete. There are no more IRIX 5 systems out there, no more NeXTstep, no more SCO Xenix, etc. etc. Let me start with AC_HEADER_STDC. We tested for this macro in order to build on environments without libc (minimal Amiga environment), but nowadays all systems come with a reasonable libc (because some libc sources are available under BSD license). 2008-05-31 Bruno Haible <br...@cl...> * configure.in: Remove AC_HEADER_STDC invocation. * m4/general.m4 (CL_MODULE_COMMON_CHECKS): Remove AC_HEADER_STDC invocation. * lispbibl.d: Assume STDC_HEADERS. * stream.d: Likewise. * unix.d: Likewise. * win32.d: Don't set STDC_HEADERS. * malloc/gmalloc.c: Assume ANSI C or C++, STDC_HEADERS, memmove. * unix/sigsegv.c: Assume STDC_HEADERS. * modules/pcre/cpcre.c: Assume STDC_HEADERS. * modules/rawsock/configure.in: Test for unistd.h. * modules/rawsock/rawsock.c: Assume STDC_HEADERS. diff -c -3 -r1.41 cpcre.c *** modules/pcre/cpcre.c 27 Feb 2008 20:48:03 -0000 1.41 --- modules/pcre/cpcre.c 31 May 2008 11:32:56 -0000 *************** *** 23,31 **** #error to CFLAGS make variable and rebuild CLISP before coming back here. #endif ! #if defined(STDC_HEADERS) ! # include <string.h> /* for memcpy(3) */ ! #endif DEFMODULE(pcre,"PCRE") --- 23,29 ---- #error to CFLAGS make variable and rebuild CLISP before coming back here. #endif ! #include <string.h> /* for memcpy(3) */ DEFMODULE(pcre,"PCRE") diff -c -3 -r1.30 configure.in *** modules/rawsock/configure.in 19 Oct 2007 20:22:18 -0000 1.30 --- modules/rawsock/configure.in 31 May 2008 11:32:56 -0000 *************** *** 13,19 **** BOLD_MSG([Rawsock (Headers)]) CL_TCPCONN AC_CHECK_HEADERS([sys/socket.h linux/if_packet.h netdb.h sys/uio.h \ ! sys/types.h sys/ioctl.h errno.h stropts.h poll.h sys/un.h ifaddrs.h]) AC_CHECK_HEADERS([net/if.h],[],[],[ #if defined(HAVE_SYS_TYPES_H) # include <sys/types.h> /* for u_long on *BSD */ --- 13,19 ---- BOLD_MSG([Rawsock (Headers)]) CL_TCPCONN AC_CHECK_HEADERS([sys/socket.h linux/if_packet.h netdb.h sys/uio.h \ ! sys/types.h sys/ioctl.h errno.h stropts.h poll.h sys/un.h ifaddrs.h unistd.h]) AC_CHECK_HEADERS([net/if.h],[],[],[ #if defined(HAVE_SYS_TYPES_H) # include <sys/types.h> /* for u_long on *BSD */ diff -c -3 -r1.96 rawsock.c *** modules/rawsock/rawsock.c 21 May 2008 20:14:44 -0000 1.96 --- modules/rawsock/rawsock.c 31 May 2008 11:32:57 -0000 *************** *** 3,9 **** * Fred Cohen, 2003-2004 * Don Cohen, 2003-2004 * Sam Steingold 2004-2008 ! * Bruno Haible 2004-2005 * <http://www.opengroup.org/onlinepubs/007908799/xns/syssocket.h.html> */ --- 3,9 ---- * Fred Cohen, 2003-2004 * Don Cohen, 2003-2004 * Sam Steingold 2004-2008 ! * Bruno Haible 2004-2008 * <http://www.opengroup.org/onlinepubs/007908799/xns/syssocket.h.html> */ *************** *** 28,39 **** #if defined(HAVE_SYS_TYPES_H) # include <sys/types.h> #endif ! #if defined(STDC_HEADERS) ! # include <stdio.h> # include <unistd.h> - # include <string.h> /* for memcpy(3) */ - # include <stddef.h> /* for offsetof */ #endif #if defined(HAVE_SYS_SOCKET_H) # include <sys/socket.h> #endif --- 28,39 ---- #if defined(HAVE_SYS_TYPES_H) # include <sys/types.h> #endif ! #include <stdio.h> ! #if defined(HAVE_UNISTD_H) # include <unistd.h> #endif + #include <string.h> /* for memcpy(3) */ + #include <stddef.h> /* for offsetof */ #if defined(HAVE_SYS_SOCKET_H) # include <sys/socket.h> #endif diff -c -3 -r1.136 configure.in *** src/configure.in 29 May 2008 22:18:46 -0000 1.136 --- src/configure.in 31 May 2008 11:33:20 -0000 *************** *** 81,87 **** AC_TYPE_LONG_LONG_INT dnl HAVE_LONG_LONG_INT dnl BOLD_MSG([checks for header files]) - AC_HEADER_STDC AC_CHECK_HEADERS(sys/inttypes.h unistd.h sys/file.h) CL_OFFSETOF dnl DEFS HAVE_OFFSETOF if offsetof in stddef.h CL_ACCESSFLAGS dnl DEFS ACCESS_NEEDS_SYS_FILE_H if sys/file.h is needed for the access() flags --- 81,86 ---- diff -c -3 -r1.785 lispbibl.d *** src/lispbibl.d 25 May 2008 20:13:40 -0000 1.785 --- src/lispbibl.d 31 May 2008 11:33:30 -0000 *************** *** 10357,10365 **** require a begin_system_call()/end_system_call() . */ #else /* let us presume, that strlen() is implemented efficiently. */ ! #ifdef STDC_HEADERS ! #include <string.h> /* declares strlen() */ ! #endif #define asciz_length(a) ((uintL)strlen(a)) #endif #endif --- 10357,10363 ---- require a begin_system_call()/end_system_call() . */ #else /* let us presume, that strlen() is implemented efficiently. */ ! #include <string.h> /* declares strlen() */ #define asciz_length(a) ((uintL)strlen(a)) #endif #endif diff -c -3 -r1.440 pathname.d *** src/pathname.d 29 May 2008 22:18:46 -0000 1.440 --- src/pathname.d 31 May 2008 11:33:34 -0000 *************** *** 59,65 **** #define readlink my_readlink #endif ! /* we need realpath() (declared in <stdlib.h>, included under STDC_HEADERS) http://www.opengroup.org/onlinepubs/009695399/functions/realpath.html which is alleged to be broken on some systems OTOH, on some other systems, notably on cygwin, --- 59,65 ---- #define readlink my_readlink #endif ! /* we need realpath() (declared in <stdlib.h>) http://www.opengroup.org/onlinepubs/009695399/functions/realpath.html which is alleged to be broken on some systems OTOH, on some other systems, notably on cygwin, diff -c -3 -r1.607 stream.d *** src/stream.d 11 May 2008 02:09:44 -0000 1.607 --- src/stream.d 31 May 2008 11:33:43 -0000 *************** *** 1,6 **** /* * Streams for CLISP ! * Bruno Haible 1990-2005 * Sam Steingold 1998-2008 * Generic Streams: Marcus Daniels 8.4.1994 * SCREEN package for Win32: Arseny Slobodjuck 2001-02-14 --- 1,6 ---- /* * Streams for CLISP ! * Bruno Haible 1990-2008 * Sam Steingold 1998-2008 * Generic Streams: Marcus Daniels 8.4.1994 * SCREEN package for Win32: Arseny Slobodjuck 2001-02-14 *************** *** 14,22 **** #include <readline/readline.h> #include <readline/history.h> #endif ! #ifdef STDC_HEADERS ! #include <string.h> /* declares strcpy(), strcat() */ ! #endif /* off_t is a signed type, defined in <sys/types.h> and <fcntl.h>, denoting a file descriptor's position. Here we also need the unsigned equivalent. */ --- 14,20 ---- #include <readline/readline.h> #include <readline/history.h> #endif ! #include <string.h> /* declares strcpy(), strcat() */ /* off_t is a signed type, defined in <sys/types.h> and <fcntl.h>, denoting a file descriptor's position. Here we also need the unsigned equivalent. */ diff -c -3 -r1.82 unix.d *** src/unix.d 29 May 2008 22:18:46 -0000 1.82 --- src/unix.d 31 May 2008 11:33:43 -0000 *************** *** 15,23 **** #define stderr_handle 2 /* the file handle for the standard error */ /* Declaration of types of I/O parameters of operating system functions */ ! #ifdef STDC_HEADERS ! #include <stdlib.h> ! #endif #include <sys/types.h> /* declares pid_t, uid_t */ #if defined(TIME_WITH_SYS_TIME) #include <sys/time.h> --- 15,21 ---- #define stderr_handle 2 /* the file handle for the standard error */ /* Declaration of types of I/O parameters of operating system functions */ ! #include <stdlib.h> #include <sys/types.h> /* declares pid_t, uid_t */ #if defined(TIME_WITH_SYS_TIME) #include <sys/time.h> diff -c -3 -r1.69 win32.d *** src/win32.d 26 Dec 2007 18:03:19 -0000 1.69 --- src/win32.d 31 May 2008 11:33:44 -0000 *************** *** 1,6 **** /* * Include file for WIN32_NATIVE version of CLISP ! * Bruno Haible 1997-2005 * Sam Steingold 1999-2007 */ --- 1,6 ---- /* * Include file for WIN32_NATIVE version of CLISP ! * Bruno Haible 1997-2008 * Sam Steingold 1999-2007 */ *************** *** 20,26 **** #endif /* for _clisp.c */ - #define STDC_HEADERS 1 #define HAVE_PERROR_DECL /* Declaration of operating system functions */ --- 20,25 ---- diff -c -3 -r1.20 general.m4 *** src/m4/general.m4 29 May 2008 17:44:27 -0000 1.20 --- src/m4/general.m4 31 May 2008 11:33:44 -0000 *************** *** 23,29 **** AC_REQUIRE([AC_PROG_CPP])dnl AC_REQUIRE([AC_GNU_SOURCE])dnl AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([AC_HEADER_TIME])dnl ]) --- 23,28 ---- diff -c -3 -r1.3 gmalloc.c *** src/malloc/gmalloc.c 20 Jun 2007 13:53:35 -0000 1.3 --- src/malloc/gmalloc.c 31 May 2008 11:33:44 -0000 *************** *** 9,15 **** /* Declarations for `malloc' and friends. Copyright (C) 1990, 1991, 1992, 1993, 1995, 1996, 1999, 2002, 2003, 2004, ! 2005, 2006, 2007 Free Software Foundation, Inc. Written May 1989 by Mike Haertel. This library is free software; you can redistribute it and/or --- 9,15 ---- /* Declarations for `malloc' and friends. Copyright (C) 1990, 1991, 1992, 1993, 1995, 1996, 1999, 2002, 2003, 2004, ! 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Written May 1989 by Mike Haertel. This library is free software; you can redistribute it and/or *************** *** 40,69 **** #include <config.h> #endif ! #if ((defined __cplusplus || (defined (__STDC__) && __STDC__) \ ! || defined STDC_HEADERS || defined PROTOTYPES) \ ! && ! defined (BROKEN_PROTOTYPES)) #undef PP #define PP(args) args #undef __ptr_t #define __ptr_t void * - #else /* Not C++ or ANSI C. */ - #undef PP - #define PP(args) () - #undef __ptr_t - #define __ptr_t char * - #endif /* C++ or ANSI C. */ - #if defined(_LIBC) || defined(STDC_HEADERS) || defined(USG) #include <string.h> - #else - #ifndef memset - #define memset(s, zero, n) bzero ((s), (n)) - #endif - #ifndef memcpy - #define memcpy(d, s, n) bcopy ((s), (d), (n)) - #endif - #endif #ifdef HAVE_LIMITS_H #include <limits.h> --- 40,52 ---- #include <config.h> #endif ! /* Assume C++ or ANSI C. */ #undef PP #define PP(args) args #undef __ptr_t #define __ptr_t void * #include <string.h> #ifdef HAVE_LIMITS_H #include <limits.h> *************** *** 88,109 **** { #endif - #ifdef STDC_HEADERS #include <stddef.h> #define __malloc_size_t size_t #define __malloc_ptrdiff_t ptrdiff_t - #else - #ifdef __GNUC__ - #include <stddef.h> - #ifdef __SIZE_TYPE__ - #define __malloc_size_t __SIZE_TYPE__ - #endif - #endif - #ifndef __malloc_size_t - #define __malloc_size_t unsigned int - #endif - #define __malloc_ptrdiff_t int - #endif #ifndef NULL #define NULL 0 --- 71,79 ---- *************** *** 1002,1022 **** #endif - /* Cope with systems lacking `memmove'. */ - #ifndef memmove - #if (defined (MEMMOVE_MISSING) || \ - !defined(_LIBC) && !defined(STDC_HEADERS) && !defined(USG)) - #ifdef emacs - #undef __malloc_safe_bcopy - #define __malloc_safe_bcopy safe_bcopy - #endif - /* This function is defined in realloc.c. */ - extern void __malloc_safe_bcopy PP ((__ptr_t, __ptr_t, __malloc_size_t)); - #define memmove(to, from, size) __malloc_safe_bcopy ((from), (to), (size)) - #endif - #endif - - /* Debugging hook for free. */ void (*__free_hook) PP ((__ptr_t __ptr)); --- 972,977 ---- *************** *** 1323,1408 **** #endif - - /* Cope with systems lacking `memmove'. */ - #if (defined (MEMMOVE_MISSING) || \ - !defined(_LIBC) && !defined(STDC_HEADERS) && !defined(USG)) - - #ifdef emacs - #undef __malloc_safe_bcopy - #define __malloc_safe_bcopy safe_bcopy - #else - - /* Snarfed directly from Emacs src/dispnew.c: - XXX Should use system bcopy if it handles overlap. */ - - /* Like bcopy except never gets confused by overlap. */ - - void - __malloc_safe_bcopy (afrom, ato, size) - __ptr_t afrom; - __ptr_t ato; - __malloc_size_t size; - { - char *from = afrom, *to = ato; - - if (size <= 0 || from == to) - return; - - /* If the source and destination don't overlap, then bcopy can - handle it. If they do overlap, but the destination is lower in - memory than the source, we'll assume bcopy can handle that. */ - if (to < from || from + size <= to) - bcopy (from, to, size); - - /* Otherwise, we'll copy from the end. */ - else - { - register char *endf = from + size; - register char *endt = to + size; - - /* If TO - FROM is large, then we should break the copy into - nonoverlapping chunks of TO - FROM bytes each. However, if - TO - FROM is small, then the bcopy function call overhead - makes this not worth it. The crossover point could be about - anywhere. Since I don't think the obvious copy loop is too - bad, I'm trying to err in its favor. */ - if (to - from < 64) - { - do - *--endt = *--endf; - while (endf != from); - } - else - { - for (;;) - { - endt -= (to - from); - endf -= (to - from); - - if (endt < to) - break; - - bcopy (endf, endt, to - from); - } - - /* If SIZE wasn't a multiple of TO - FROM, there will be a - little left over. The amount left over is - (endt + (to - from)) - to, which is endt - from. */ - bcopy (from, to, endt - from); - } - } - } - #endif /* emacs */ - - #ifndef memmove - extern void __malloc_safe_bcopy PP ((__ptr_t, __ptr_t, __malloc_size_t)); - #define memmove(to, from, size) __malloc_safe_bcopy ((from), (to), (size)) - #endif - - #endif - - #define min(A, B) ((A) < (B) ? (A) : (B)) /* Debugging hook for realloc. */ --- 1278,1283 ---- *************** *** 1860,1881 **** unsigned long int magic; /* Magic number to check header integrity. */ }; - #if defined(_LIBC) || defined(STDC_HEADERS) || defined(USG) - #define flood memset - #else - static void flood __P ((__ptr_t, int, __malloc_size_t)); - static void - flood (ptr, val, size) - __ptr_t ptr; - int val; - __malloc_size_t size; - { - char *cp = ptr; - while (size--) - *cp++ = val; - } - #endif - static enum mcheck_status checkhdr __P ((const struct hdr *)); static enum mcheck_status checkhdr (hdr) --- 1735,1740 ---- *************** *** 1914,1920 **** hdr = ((struct hdr *) ptr) - 1; checkhdr (hdr); hdr->magic = MAGICFREE; ! flood (ptr, FREEFLOOD, hdr->size); } else hdr = NULL; --- 1773,1779 ---- hdr = ((struct hdr *) ptr) - 1; checkhdr (hdr); hdr->magic = MAGICFREE; ! memset (ptr, FREEFLOOD, hdr->size); } else hdr = NULL; *************** *** 1940,1946 **** hdr->size = size; hdr->magic = MAGICWORD; ((char *) &hdr[1])[size] = MAGICBYTE; ! flood ((__ptr_t) (hdr + 1), MALLOCFLOOD, size); return (__ptr_t) (hdr + 1); } --- 1799,1805 ---- hdr->size = size; hdr->magic = MAGICWORD; ((char *) &hdr[1])[size] = MAGICBYTE; ! memset ((__ptr_t) (hdr + 1), MALLOCFLOOD, size); return (__ptr_t) (hdr + 1); } *************** *** 1960,1966 **** checkhdr (hdr); if (size < osize) ! flood ((char *) ptr + size, FREEFLOOD, osize - size); } __free_hook = old_free_hook; --- 1819,1825 ---- checkhdr (hdr); if (size < osize) ! memset ((char *) ptr + size, FREEFLOOD, osize - size); } __free_hook = old_free_hook; *************** *** 1977,1983 **** hdr->magic = MAGICWORD; ((char *) &hdr[1])[size] = MAGICBYTE; if (size > osize) ! flood ((char *) (hdr + 1) + osize, MALLOCFLOOD, size - osize); return (__ptr_t) (hdr + 1); } --- 1836,1842 ---- hdr->magic = MAGICWORD; ((char *) &hdr[1])[size] = MAGICBYTE; if (size > osize) ! memset ((char *) (hdr + 1) + osize, MALLOCFLOOD, size - osize); return (__ptr_t) (hdr + 1); } diff -c -3 -r1.5 sigsegv.c *** unix/sigsegv.c 22 Oct 2007 22:29:10 -0000 1.5 --- unix/sigsegv.c 31 May 2008 11:33:45 -0000 *************** *** 39,49 **** /* The following bits of information can be copied from config.h. */ - /* CL_STDC_HEADERS */ - /* Define if you have the ANSI C header files - <stdlib.h>, <stdarg.h>, <string.h>, <float.h>, <limits.h>. */ - #undef STDC_HEADERS - /* CL_UNISTD_H */ /* Define if you have <unistd.h>. */ #undef HAVE_UNISTD_H --- 39,44 ---- *************** *** 62,70 **** /* Declarations. */ - #ifdef STDC_HEADERS #include <stdlib.h> - #endif #ifdef HAVE_UNISTD_H #include <sys/types.h> --- 57,63 ---- |
|
From: Bruno H. <br...@cl...> - 2008-05-31 11:44:05
|
> 4 -rw-rw-r-- 1 sds src 1128 Aug 2 2003 abort.m4 Removed as follows. 2008-05-31 Bruno Haible <br...@cl...> * configure.in: Remove CL_ABORT invocation. * m4/abort.m4: Remove file. * unix.d (abort): Assume <stdlib.h> declares it. diff -c -3 -r1.137 configure.in *** src/configure.in 31 May 2008 11:35:49 -0000 1.137 --- src/configure.in 31 May 2008 11:41:18 -0000 *************** *** 117,123 **** CL_SIGINTERRUPT dnl DEFS HAVE_SIGINTERRUPT, HAVE_SIGVEC CL_FPU_CONTROL dnl DEFS HAVE_FPU_CONTROL_T, HAVE_SETFPUCW CL_RAISE dnl DEFS HAVE_RAISE - CL_ABORT dnl DEFS RETABORTTYPE, ABORT_VOLATILE CL_PERROR dnl DEFS HAVE_PERROR_DECL AC_CHECK_FUNCS(strerror sysconf getdtablesize memset setsid setpgid fchmod dnl fsync flock gethostent shutdown usleep ualarm setitimer nice ftime realpath dnl --- 117,122 ---- diff -c -3 -r1.83 unix.d *** src/unix.d 31 May 2008 11:35:53 -0000 1.83 --- src/unix.d 31 May 2008 11:41:18 -0000 *************** *** 206,212 **** /* used by SPVW, PATHNAME, STREAM */ /* Immediate abnormal termination, jump into the debugger */ ! extern_C ABORT_VOLATILE RETABORTTYPE abort (void); /* ABORT(3) */ /* used by SPVW, DEBUG, EVAL, IO */ /* signal handling */ --- 206,213 ---- /* used by SPVW, PATHNAME, STREAM */ /* Immediate abnormal termination, jump into the debugger */ ! /* #include <stdlib.h> - see above */ ! /* extern_C [volatile] void abort (void); */ /* ABORT(3) */ /* used by SPVW, DEBUG, EVAL, IO */ /* signal handling */ |
|
From: Bruno H. <br...@cl...> - 2008-05-31 12:05:14
|
Sam wrote:
> 4 -rw-rw-r-- 1 sds src 1244 Aug 2 2003 access.m4
Eliminated as follows:
2008-05-31 Bruno Haible <br...@cl...>
* configure.in: Remove CL_ACCESSFLAGS invocation.
* m4/access.m4: Remove file.
* unix.d: Assume <unistd.h> declares R_OK, W_OK, X_OK.
diff -c -3 -r1.138 configure.in
*** src/configure.in 31 May 2008 11:44:00 -0000 1.138
--- src/configure.in 31 May 2008 12:02:27 -0000
***************
*** 83,89 ****
BOLD_MSG([checks for header files])
AC_CHECK_HEADERS(sys/inttypes.h unistd.h sys/file.h)
CL_OFFSETOF dnl DEFS HAVE_OFFSETOF if offsetof in stddef.h
- CL_ACCESSFLAGS dnl DEFS ACCESS_NEEDS_SYS_FILE_H if sys/file.h is needed for the access() flags
CL_OPENFLAGS dnl DEFS OPEN_NEEDS_SYS_FILE_H if sys/file.h is needed for the open() flags
CL_UTSNAME dnl DEFS HAVE_SYS_UTSNAME_H
CL_SHM_H dnl DEFS HAVE_SYS_IPC_H, HAVE_SYS_SHM_H
--- 83,88 ----
diff -c -3 -r1.84 unix.d
*** src/unix.d 31 May 2008 11:44:00 -0000 1.84
--- src/unix.d 31 May 2008 12:02:27 -0000
***************
*** 422,430 ****
/* used by PATHNAME */
/* work with open files: */
! #include <fcntl.h>
! /* declares open() */
! #if defined(ACCESS_NEEDS_SYS_FILE_H) || defined(OPEN_NEEDS_SYS_FILE_H)
#include <sys/file.h>
#endif
/* Only a few Unices (like UNIX_CYGWIN32) have O_TEXT and O_BINARY.
--- 422,430 ----
/* used by PATHNAME */
/* work with open files: */
! #include <fcntl.h> /* declares open() */
! /* #include <unistd.h> - declares R_OK, W_OK, X_OK - included above */
! #if defined(OPEN_NEEDS_SYS_FILE_H)
#include <sys/file.h>
#endif
/* Only a few Unices (like UNIX_CYGWIN32) have O_TEXT and O_BINARY.
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 12:12:42
|
Sam wrote: > 4 -rw-rw-r-- 1 sds src 3280 Apr 29 2002 c++-constructors.m4 This file is not needed in clisp. It lives in CLN. Removed: 2008-05-31 Bruno Haible <br...@cl...> * m4/c++-constructors.m4: Remove file. |
|
From: Bruno H. <br...@cl...> - 2008-05-31 12:23:29
|
Sam wrote:
> 4 -rw-rw-r-- 1 sds src 821 Apr 29 2002 cc-cppaux.m4
Gone like this:
2008-05-31 Bruno Haible <br...@cl...>
* configure.in: Remove CL_CC_NEED_CCPAUX invocation.
* m4/cc-cppaux.m4: Remove file.
* makemake.in (CC_NEED_CCPAUX, XCC_NEED_CCPAUX): Remove variables.
(*asm*.c): Fix dependency to use XASMCCPAUX.
diff -c -3 -r1.139 configure.in
*** src/configure.in 31 May 2008 12:04:33 -0000 1.139
--- src/configure.in 31 May 2008 12:20:06 -0000
***************
*** 52,58 ****
CL_CC_GCC dnl sets variables CC_GCC, GCC_X_NONE
CL_CC_SUNPRO dnl sets variable CC_SUNPRO
CL_CC_CPLUSPLUS dnl sets variable CC_CPLUSPLUS
- CL_CC_NEED_CCPAUX dnl sets variable CC_NEED_CCPAUX
CL_CC_NEED_DEEMA dnl sets variable CC_NEED_DEEMA
CL_AS_UNDERSCORE dnl sets variable AS_UNDERSCORE, DEFS ASM_UNDERSCORE
CL_IRIX_SUN dnl LIBS -lsun
--- 52,57 ----
diff -c -3 -r1.748 makemake.in
*** src/makemake.in 27 May 2008 21:05:19 -0000 1.748
--- src/makemake.in 31 May 2008 12:20:08 -0000
***************
*** 510,516 ****
CC_GCC='@CC_GCC@' # either true or false
CC_SUNPRO='@CC_SUNPRO@' # either true or false
CC_CPLUSPLUS='@CC_CPLUSPLUS@' # either true or false
- CC_NEED_CCPAUX='@CC_NEED_CCPAUX@' # either true or false
CC_NEED_DEEMA='@CC_NEED_DEEMA@' # either true or false
AS_UNDERSCORE='@AS_UNDERSCORE@' # either true or false
RANLIB='@RANLIB@' # either 'ranlib' or ':'
--- 510,515 ----
***************
*** 600,606 ****
CC='cl'
CC_GCC=false
CFLAGS='$(MFLAGS)'
- CC_NEED_CCPAUX=false
AS_UNDERSCORE=false
CC_NEED_DEEMA=true
FFCALL_LIBS='avcall.lib callback.lib'
--- 599,604 ----
***************
*** 630,636 ****
XCFLAGS=''
XLDFLAGS=''
XCC_GCC=true
- XCC_NEED_CCPAUX=false
XCC_NEED_DEEMA=false
else
TSYS="$HSYS"
--- 628,633 ----
***************
*** 641,647 ****
XCFLAGS="${CFLAGS}"
XLDFLAGS="${LDFLAGS}"
XCC_GCC="${CC_GCC}"
- XCC_NEED_CCPAUX="${CC_NEED_CCPAUX}"
XCC_NEED_DEEMA="${CC_NEED_DEEMA}"
fi
XCC_UNUSABLE_CPP=false
--- 638,643 ----
***************
*** 2156,2165 ****
if [ -n "$XCC_SUNPRO" ] ; then
XASM_NEED_CCPAUX=true
else
! XASM_NEED_CCPAUX=$XCC_NEED_CCPAUX
fi
! if [ $CC_NEED_CCPAUX = true -o $XCC_NEED_CCPAUX = true -o $XASM_NEED_CCPAUX = true ] ; then
NEED_CCPAUX=true
else
NEED_CCPAUX=false
--- 2152,2161 ----
if [ -n "$XCC_SUNPRO" ] ; then
XASM_NEED_CCPAUX=true
else
! XASM_NEED_CCPAUX=false
fi
! if [ $XASM_NEED_CCPAUX = true ] ; then
NEED_CCPAUX=true
else
NEED_CCPAUX=false
***************
*** 2169,2188 ****
echol "GCTRIGGER = ${HERE}gctrigger"
echol "VARBRACE = ${HERE}varbrace"
- if [ $CC_NEED_CCPAUX = true ] ; then
- CCPAUX='ccpaux'$HEXE
- CCPAUX_FILTER=' | '$HERE'ccpaux'
- else
- CCPAUX=''
- CCPAUX_FILTER=''
- fi
- if [ $XCC_NEED_CCPAUX = true ] ; then
- XCCPAUX='ccpaux'$HEXE
- XCCPAUX_FILTER=' | '$HERE'ccpaux'
- else
- XCCPAUX=''
- XCCPAUX_FILTER=''
- fi
if [ $XASM_NEED_CCPAUX = true ] ; then
XASMCCPAUX='ccpaux'$HEXE
XASMCCPAUX_FILTER=' | '$HERE'ccpaux'
--- 2165,2170 ----
***************
*** 2430,2447 ****
for util in ${UTILS} ; do
case ${util} in
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 "${UTILCOMPILE}" "${util}.c" "${util}"
! echotab "\$(RM) ${util}.c"
! echol
! OBSOLETE=$OBSOLETE" ${util}.c"
! else
! echol "${util}${HEXE} : ${UTILDIR_M}${util}.c"
! echotab_to_HEXE "${UTILCOMPILE}" "${UTILDIR_CC}${util}.c" "${util}"
! echol
! fi
;;
* )
echol "${util}${HEXE} : ${UTILDIR_M}${util}.c"
--- 2412,2420 ----
for util in ${UTILS} ; do
case ${util} in
comment5 )
! echol "${util}${HEXE} : ${UTILDIR_M}${util}.c"
! echotab_to_HEXE "${UTILCOMPILE}" "${UTILDIR_CC}${util}.c" "${util}"
! echol
;;
* )
echol "${util}${HEXE} : ${UTILDIR_M}${util}.c"
***************
*** 2499,2505 ****
done
for f in $ARI_ASMD $SP_ASMD ; do
! echol "${f}.c : ${SRCDIR}${f}.d comment5${HEXE} ${XCCPAUX}"
echotabpipe "\$(COMMENT5) ${SRCDIR}${f}.d${XASMCCPAUX_FILTER} > ${f}.c"
echol
done
--- 2472,2478 ----
done
for f in $ARI_ASMD $SP_ASMD ; do
! echol "${f}.c : ${SRCDIR}${f}.d comment5${HEXE} ${XASMCCPAUX}"
echotabpipe "\$(COMMENT5) ${SRCDIR}${f}.d${XASMCCPAUX_FILTER} > ${f}.c"
echol
done
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 12:29:36
|
Sam wrote: > 4 -rw-rw-r-- 1 sds src 1333 Aug 2 2003 cc-void.m4 We assume ANSI C or C++, so this is redundant too: 2008-05-31 Bruno Haible <br...@cl...> * configure.in: Remove CL_VOID invocation. * m4/general.m4 (CL_FFCALL_COMMON_TRAMPOLINE): Likewise. * m4/cc-void.m4: Remove file. diff -c -3 -r1.140 configure.in *** src/configure.in 31 May 2008 12:24:05 -0000 1.140 --- src/configure.in 31 May 2008 12:26:48 -0000 *************** *** 75,81 **** dnl BOLD_MSG([checks for fundamental compiler characteristics]) AC_C_INLINE dnl DEFS inline - CL_VOID dnl DEFS void CL_BUILTIN_STRLEN dnl DEFS HAVE_BUILTIN_STRLEN AC_TYPE_LONG_LONG_INT dnl HAVE_LONG_LONG_INT dnl --- 75,80 ---- diff -c -3 -r1.21 general.m4 *** src/m4/general.m4 31 May 2008 11:35:53 -0000 1.21 --- src/m4/general.m4 31 May 2008 12:26:49 -0000 *************** *** 32,39 **** ]) AC_DEFUN([CL_FFCALL_COMMON_TRAMPOLINE], ! [AC_REQUIRE([CL_VOID])dnl ! AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([CL_GETPAGESIZE])dnl AC_REQUIRE([CL_MACH_VM])dnl AC_REQUIRE([CL_OPENFLAGS])dnl --- 32,38 ---- ]) AC_DEFUN([CL_FFCALL_COMMON_TRAMPOLINE], ! [AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([CL_GETPAGESIZE])dnl AC_REQUIRE([CL_MACH_VM])dnl AC_REQUIRE([CL_OPENFLAGS])dnl |
|
From: Bruno H. <br...@cl...> - 2008-05-31 12:43:33
|
CL_CLOSEDIR can at least be simplified. I think it's probable that the
mentioned Cygwin bug is not relevant nowadays any more, but I'm not sure.
2008-05-31 Bruno Haible <br...@cl...>
* m4/closedir.m4 (CL_CLOSEDIR): Remove check for the prototype.
Don't define RETCLOSEDIRTYPE any more.
diff -c -3 -r1.141 configure.in
*** src/configure.in 31 May 2008 12:28:56 -0000 1.141
--- src/configure.in 31 May 2008 12:39:04 -0000
***************
*** 128,134 ****
AC_HEADER_TIME
CL_STAT dnl DEFS HAVE_LSTAT etc
CL_ELOOP dnl DEFS ELOOP_VALUE
! CL_CLOSEDIR dnl DEFS RETCLOSEDIRTYPE, VOID_CLOSEDIR
CL_IOCTL dnl DEFS HAVE_IOCTL, IOCTL_REQUEST_T, IOCTL_ARGUMENT_T, IOCTL_DOTS HAVE_FIONREAD, NEED_SYS_FILIO_H, NEED_SYS_IOCTL_H, HAVE_RELIABLE_FIONREAD
CL_POLL dnl DEFS HAVE_POLL, HAVE_RELIABLE_POLL
CL_SELECT dnl DEFS HAVE_SELECT, SELECT_WIDTH_T, SELECT_SET_T, SELECT_CONST, HAVE_RELIABLE_SELECT
--- 128,134 ----
AC_HEADER_TIME
CL_STAT dnl DEFS HAVE_LSTAT etc
CL_ELOOP dnl DEFS ELOOP_VALUE
! CL_CLOSEDIR dnl DEFS VOID_CLOSEDIR
CL_IOCTL dnl DEFS HAVE_IOCTL, IOCTL_REQUEST_T, IOCTL_ARGUMENT_T, IOCTL_DOTS HAVE_FIONREAD, NEED_SYS_FILIO_H, NEED_SYS_IOCTL_H, HAVE_RELIABLE_FIONREAD
CL_POLL dnl DEFS HAVE_POLL, HAVE_RELIABLE_POLL
CL_SELECT dnl DEFS HAVE_SELECT, SELECT_WIDTH_T, SELECT_SET_T, SELECT_CONST, HAVE_RELIABLE_SELECT
diff -c -3 -r1.85 unix.d
*** src/unix.d 31 May 2008 12:04:33 -0000 1.85
--- src/unix.d 31 May 2008 12:39:05 -0000
***************
*** 405,411 ****
/* directory search: */
#include <dirent.h>
! /* declared in one of the above includes: opendir(), readdir(), closedir() */
#ifdef VOID_CLOSEDIR
#define CLOSEDIR(dirp) (closedir(dirp),0)
#else
--- 405,411 ----
/* directory search: */
#include <dirent.h>
! /* declared in <dirent.h>: opendir(), readdir(), closedir() */
#ifdef VOID_CLOSEDIR
#define CLOSEDIR(dirp) (closedir(dirp),0)
#else
diff -c -3 -r1.5 closedir.m4
*** src/m4/closedir.m4 29 May 2008 22:18:46 -0000 1.5
--- src/m4/closedir.m4 31 May 2008 12:39:05 -0000
***************
*** 12,35 ****
AC_DEFUN([CL_CLOSEDIR],
[AC_BEFORE([$0], [CL_FILECHARSET])dnl
! CL_PROTO([closedir], [
! CL_PROTO_RET([
! #include <stdlib.h>
! #ifdef HAVE_UNISTD_H
! #include <sys/types.h>
! #include <unistd.h>
! #endif
! #include <dirent.h>
! ], [int closedir (DIR* dir);], [int closedir();],
! cl_cv_proto_closedir_ret, int, void)],
! [extern $cl_cv_proto_closedir_ret closedir (DIR*);])
! AC_DEFINE_UNQUOTED(RETCLOSEDIRTYPE,$cl_cv_proto_closedir_ret,[closedir() return type])
! if test $cl_cv_proto_closedir_ret = void; then
! AC_DEFINE(VOID_CLOSEDIR,,[closedir() return value is void or unusable])
! else
! # The following test is necessary, because Cygwin32 declares closedir()
! # as returning int but the return value is unusable.
! AC_CACHE_CHECK(for usable closedir return value, cl_cv_func_closedir_retval,[
AC_TRY_RUN([
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
--- 12,20 ----
AC_DEFUN([CL_CLOSEDIR],
[AC_BEFORE([$0], [CL_FILECHARSET])dnl
! # The following test is necessary, because Cygwin32 declares closedir()
! # as returning int but the return value is unusable.
! AC_CACHE_CHECK(for usable closedir return value, cl_cv_func_closedir_retval,[
AC_TRY_RUN([
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
***************
*** 45,49 ****
case "$cl_cv_func_closedir_retval" in
*no) AC_DEFINE(VOID_CLOSEDIR,,[closedir() return value is void or unusable]) ;;
esac
- fi
])
--- 30,33 ----
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 12:53:43
|
Sam wrote:
> 4 -rw-rw-r-- 1 sds src 749 Apr 29 2002 cp.m4
The autoconf manual does not mention the problem that cp does not understand
the -p option, therefore it's safe to assume that this problem does not
exist any more.
2008-05-31 Bruno Haible <br...@cl...>
* configure.in: Remove CL_PROG_CP invocation.
* m4/cp.m4: Remove file.
* m4/ln.m4 (CL_PROG_LN): Assume "cp -p" works on Unix.
* makemake.in (CP): Likewise.
diff -c -3 -r1.142 configure.in
*** src/configure.in 31 May 2008 12:43:37 -0000 1.142
--- src/configure.in 31 May 2008 12:49:46 -0000
***************
*** 36,42 ****
AC_PROG_CPP dnl sets variable CPP
gl_EARLY
AC_PROG_INSTALL dnl sets variables INSTALL, INSTALL_DATA, INSTALL_PROGRAM
- CL_PROG_CP dnl sets variable CP
CL_PROG_LN_S dnl sets variable LN_S
CL_PROG_HLN dnl sets variable HLN
AC_LIBTOOL_WIN32_DLL
--- 36,41 ----
diff -c -3 -r1.749 makemake.in
*** src/makemake.in 31 May 2008 12:24:05 -0000 1.749
--- src/makemake.in 31 May 2008 12:49:48 -0000
***************
*** 498,504 ****
# These variables are set by configure:
# srcdir='@srcdir@' # either '.' or '../src', see above
! CP='@CP@' # either 'cp -p' or 'cp'
LN_S='@LN_S@' # either 'ln -s' or 'ln'
LN='@LN@' # either 'ln' or ${CP}
HLN='@HLN@' # either 'ln' or 'hln'
--- 498,504 ----
# These variables are set by configure:
# srcdir='@srcdir@' # either '.' or '../src', see above
! CP='cp -p' # either 'cp -p' or 'cp'
LN_S='@LN_S@' # either 'ln -s' or 'ln'
LN='@LN@' # either 'ln' or ${CP}
HLN='@HLN@' # either 'ln' or 'hln'
diff -c -3 -r1.7 ln.m4
*** src/m4/ln.m4 29 May 2008 16:07:29 -0000 1.7
--- src/m4/ln.m4 31 May 2008 12:49:49 -0000
***************
*** 11,24 ****
AC_PREREQ(2.13)
AC_DEFUN([CL_PROG_LN],
! [AC_REQUIRE([CL_PROG_CP])dnl
! AC_CACHE_CHECK(how to make hard links, cl_cv_prog_LN, [
rm -f conftestdata conftestfile
echo data > conftestfile
if ln conftestfile conftestdata 2>/dev/null; then
cl_cv_prog_LN=ln
else
! cl_cv_prog_LN="$cl_cv_prog_cp"
fi
rm -f conftestdata conftestfile
])
--- 11,23 ----
AC_PREREQ(2.13)
AC_DEFUN([CL_PROG_LN],
! [AC_CACHE_CHECK(how to make hard links, cl_cv_prog_LN, [
rm -f conftestdata conftestfile
echo data > conftestfile
if ln conftestfile conftestdata 2>/dev/null; then
cl_cv_prog_LN=ln
else
! cl_cv_prog_LN="cp -p"
fi
rm -f conftestdata conftestfile
])
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 13:00:21
|
Sam wrote: > 4 -rw-rw-r-- 1 sds src 1209 Aug 2 2003 fpu_control.m4 clisp does not use this any more. 2008-05-31 Bruno Haible <br...@cl...> * configure.in: Remove CL_FPU_CONTROL invocation. * m4/fpu_control.m4: Remove file. diff -c -3 -r1.143 configure.in *** src/configure.in 31 May 2008 12:53:44 -0000 1.143 --- src/configure.in 31 May 2008 12:58:20 -0000 *************** *** 111,117 **** CL_SIGACTION_REINSTALL dnl DEFS SIGACTION_NEED_REINSTALL CL_SIGACTION_UNBLOCK dnl DEFS SIGACTION_NEED_UNBLOCK CL_SIGINTERRUPT dnl DEFS HAVE_SIGINTERRUPT, HAVE_SIGVEC - CL_FPU_CONTROL dnl DEFS HAVE_FPU_CONTROL_T, HAVE_SETFPUCW CL_RAISE dnl DEFS HAVE_RAISE CL_PERROR dnl DEFS HAVE_PERROR_DECL AC_CHECK_FUNCS(strerror sysconf getdtablesize memset setsid setpgid fchmod dnl --- 111,116 ---- |
|
From: Bruno H. <br...@cl...> - 2008-05-31 13:05:49
|
This one can be simplified. <sun/netdb.h> is very old, probably SunOS 4.
2008-05-31 Bruno Haible <br...@cl...>
* m4/gethostbyname.m4 (CL_GETHOSTBYNAME): Remove test for sun/netdb.h.
* unix.d: When gethostbyname exists, assume <sys/socket.h> and <netdb.h>
exist.
diff -c -3 -r1.86 unix.d
*** src/unix.d 31 May 2008 12:43:37 -0000 1.86
--- src/unix.d 31 May 2008 13:02:40 -0000
***************
*** 734,745 ****
/* extern_C int gethostname (char* name, size_t namelen); */ /* GETHOSTNAME(2) */
#endif
#ifdef HAVE_GETHOSTBYNAME
! #ifdef HAVE_NETDB_H
! #include <sys/socket.h>
! #include <netdb.h>
! #else
! #include <sun/netdb.h>
! #endif
/* gethostbyname() is declared in the above files */
#endif
#ifndef MAXHOSTNAMELEN
--- 734,741 ----
/* extern_C int gethostname (char* name, size_t namelen); */ /* GETHOSTNAME(2) */
#endif
#ifdef HAVE_GETHOSTBYNAME
! #include <sys/socket.h>
! #include <netdb.h>
/* gethostbyname() is declared in the above files */
#endif
#ifndef MAXHOSTNAMELEN
diff -c -3 -r1.4 gethostbyname.m4
*** src/m4/gethostbyname.m4 30 Oct 2007 21:09:14 -0000 1.4
--- src/m4/gethostbyname.m4 31 May 2008 13:02:40 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2008 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
***************
*** 11,16 ****
AC_PREREQ(2.57)
AC_DEFUN([CL_GETHOSTBYNAME],
! [AC_CHECK_HEADERS(netdb.h sun/netdb.h,
[AC_DEFINE(HAVE_GETHOSTBYNAME,,[have gethostbyname()])dnl
break])])
--- 11,16 ----
AC_PREREQ(2.57)
AC_DEFUN([CL_GETHOSTBYNAME],
! [AC_CHECK_HEADERS(netdb.h,
[AC_DEFINE(HAVE_GETHOSTBYNAME,,[have gethostbyname()])dnl
break])])
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 13:14:40
|
Sam wrote:
> 4 -rw-rw-r-- 1 sds src 1554 Aug 2 2003 gettimeofday.m4
This can be simplified:
2008-05-31 Bruno Haible <br...@cl...>
* m4/gettimeofday.m4 (CL_GETTIMEOFDAY): Remove test for the prototype.
* unix.d (gettimeofday): Assume the declaration in <sys/time.h>.
diff -c -3 -r1.144 configure.in
*** src/configure.in 31 May 2008 13:01:01 -0000 1.144
--- src/configure.in 31 May 2008 13:12:41 -0000
***************
*** 130,136 ****
CL_IOCTL dnl DEFS HAVE_IOCTL, IOCTL_REQUEST_T, IOCTL_ARGUMENT_T, IOCTL_DOTS HAVE_FIONREAD, NEED_SYS_FILIO_H, NEED_SYS_IOCTL_H, HAVE_RELIABLE_FIONREAD
CL_POLL dnl DEFS HAVE_POLL, HAVE_RELIABLE_POLL
CL_SELECT dnl DEFS HAVE_SELECT, SELECT_WIDTH_T, SELECT_SET_T, SELECT_CONST, HAVE_RELIABLE_SELECT
! CL_GETTIMEOFDAY dnl DEFS HAVE_GETTIMEOFDAY, GETTIMEOFDAY_DOTS, GETTIMEOFDAY_TZP_T
CL_TIMES_CLOCK dnl DEFS HAVE_TIMES_CLOCK (only if no ftime())
CL_GETHOSTBYNAME dnl DEFS HAVE_GETHOSTBYNAME
CL_CONNECT dnl DEFS HAVE_CONNECT CONNECT_NAME_T, CONNECT_CONST, CONNECT_ADDRLEN_T
--- 130,136 ----
CL_IOCTL dnl DEFS HAVE_IOCTL, IOCTL_REQUEST_T, IOCTL_ARGUMENT_T, IOCTL_DOTS HAVE_FIONREAD, NEED_SYS_FILIO_H, NEED_SYS_IOCTL_H, HAVE_RELIABLE_FIONREAD
CL_POLL dnl DEFS HAVE_POLL, HAVE_RELIABLE_POLL
CL_SELECT dnl DEFS HAVE_SELECT, SELECT_WIDTH_T, SELECT_SET_T, SELECT_CONST, HAVE_RELIABLE_SELECT
! CL_GETTIMEOFDAY dnl DEFS HAVE_GETTIMEOFDAY
CL_TIMES_CLOCK dnl DEFS HAVE_TIMES_CLOCK (only if no ftime())
CL_GETHOSTBYNAME dnl DEFS HAVE_GETHOSTBYNAME
CL_CONNECT dnl DEFS HAVE_CONNECT CONNECT_NAME_T, CONNECT_CONST, CONNECT_ADDRLEN_T
diff -c -3 -r1.87 unix.d
*** src/unix.d 31 May 2008 13:06:38 -0000 1.87
--- src/unix.d 31 May 2008 13:12:42 -0000
***************
*** 643,653 ****
/* process date/time of day: */
#if defined(HAVE_GETTIMEOFDAY)
! #ifdef GETTIMEOFDAY_DOTS
! extern_C int gettimeofday (struct timeval * tp, ...); /* GETTIMEOFDAY(2) */
! #else
! extern_C int gettimeofday (struct timeval * tp, GETTIMEOFDAY_TZP_T tzp); /* GETTIMEOFDAY(2) */
! #endif
#elif defined(HAVE_FTIME)
#include <sys/timeb.h>
extern_C int ftime (struct timeb * tp); /* TIME(3V) */
--- 643,650 ----
/* process date/time of day: */
#if defined(HAVE_GETTIMEOFDAY)
! /* gettimeofday is declared in <sys/time.h> - included above */
! /* extern_C int gettimeofday (struct timeval * tp, struct timezone *tzp); */ /* GETTIMEOFDAY(2) */
#elif defined(HAVE_FTIME)
#include <sys/timeb.h>
extern_C int ftime (struct timeb * tp); /* TIME(3V) */
diff -c -3 -r1.2 gettimeofday.m4
*** src/m4/gettimeofday.m4 3 Aug 2003 00:22:38 -0000 1.2
--- src/m4/gettimeofday.m4 31 May 2008 13:12:42 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2008 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
***************
*** 13,42 ****
AC_DEFUN([CL_GETTIMEOFDAY],
[AC_BEFORE([$0], [CL_TIMES_CLOCK])
AC_CHECK_FUNCS(gettimeofday)dnl
- if test $ac_cv_func_gettimeofday = yes; then
- dnl HAVE_GETTIMEOFDAY is defined
- CL_PROTO([gettimeofday], [
- CL_PROTO_TRY([
- #include <sys/types.h>
- #include <sys/time.h>
- ], [int gettimeofday (struct timeval * tp, struct timezone * tzp);],
- [int gettimeofday();],
- cl_cv_proto_gettimeofday_dots=no
- cl_cv_proto_gettimeofday_arg2="struct timezone *",
- CL_PROTO_TRY([
- #include <sys/types.h>
- #include <sys/time.h>
- ], [int gettimeofday (struct timeval * tp, void * tzp);],
- [int gettimeofday();],
- cl_cv_proto_gettimeofday_dots=no
- cl_cv_proto_gettimeofday_arg2="void *",
- cl_cv_proto_gettimeofday_dots=yes
- cl_cv_proto_gettimeofday_arg2="..."))
- ], [extern int gettimeofday (struct timeval *, $cl_cv_proto_gettimeofday_arg2);])
- if test $cl_cv_proto_gettimeofday_dots = yes; then
- AC_DEFINE(GETTIMEOFDAY_DOTS,,[declaration of gettimeofday() needs dots])
- else
- AC_DEFINE_UNQUOTED(GETTIMEOFDAY_TZP_T,$cl_cv_proto_gettimeofday_arg2,[type of `tzp' in gettimeofday() declaration])
- fi
- fi
])
--- 13,16 ----
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 13:45:10
|
A lot of old code exists specially for NeXTstep. Time to remove it. I mean,
these machines were sold from ca. 1991/1992 to 1994. It was a nice platform,
and some people did music programs in CL with it. But it's museumware now.
2008-05-31 Bruno Haible <br...@cl...>
Remove NeXTstep support.
* SUMMARY: Remove mention of NeXTstep.
* lispbibl.d (UNIX_NEXTSTEP, NEXTSTEP_CHS): Remove macros.
* charstrg.d: Remove NEXTSTEP_CHS special casing.
* io.d: Likewise.
* eval.d (interpret_bytecode): Drop UNIX_NEXTSTEP conditional.
* lightning.c (LD, LR): Likewise.
* misc.d (MACHINE-TYPE): Likewise.
* spvw.d (init_memory): Likewise.
* unix.d: Likewise.
* nls_nextstep.c: Remove file.
* pseudofun.d (nls_nextstep_table): Remove.
* makemake.in (NLS_INCLUDES): Remove nls_nextstep.
* utils/unicode/Makefile (ALL): Remove nls_nextstep.c.
(nls_nextstep.c): Remove rule.
diff -c -3 -r1.30 SUMMARY
*** SUMMARY 21 May 2008 01:42:53 -0000 1.30
--- SUMMARY 31 May 2008 13:33:12 -0000
***************
*** 3,9 ****
University and Michael Stoll of Munich University, both in Germany.
It mostly supports the Lisp described in the ANSI Common Lisp standard.
It runs on most GNU and Unix systems (GNU/Linux, GNU/Hurd, FreeBSD, NetBSD,
! OpenBSD, Solaris, Tru64, HP-UX, BeOS, NeXTstep, IRIX, AIX, Mac OS X and others)
and on other systems (Windows NT/2000/XP/Vista, Windows 95/98/ME)
and needs only 4 MB of RAM.
It is Free Software and may be distributed under the terms of GNU GPL,
--- 3,9 ----
University and Michael Stoll of Munich University, both in Germany.
It mostly supports the Lisp described in the ANSI Common Lisp standard.
It runs on most GNU and Unix systems (GNU/Linux, GNU/Hurd, FreeBSD, NetBSD,
! OpenBSD, Solaris, Tru64, HP-UX, BeOS, IRIX, AIX, Mac OS X and others)
and on other systems (Windows NT/2000/XP/Vista, Windows 95/98/ME)
and needs only 4 MB of RAM.
It is Free Software and may be distributed under the terms of GNU GPL,
diff -c -3 -r1.514 impbody.xml
*** doc/impbody.xml 30 May 2008 17:32:45 -0000 1.514
--- doc/impbody.xml 31 May 2008 13:33:16 -0000
***************
*** 2217,2223 ****
<!-- #if defined(ISOLATIN_CHS) && !defined(UNICODE) -->
<variablelist>
! <varlistentry><term><emphasis role="plat-dep">&unix; (except &nextstep;),
&win32; platforms only, and only in
&clisp; built &without; compile-time flag &unicode;.</emphasis></term>
<listitem><para>More precisely, &clisp; uses the ISO Latin-1 (ISO
--- 2217,2223 ----
<!-- #if defined(ISOLATIN_CHS) && !defined(UNICODE) -->
<variablelist>
! <varlistentry><term><emphasis role="plat-dep">&unix;,
&win32; platforms only, and only in
&clisp; built &without; compile-time flag &unicode;.</emphasis></term>
<listitem><para>More precisely, &clisp; uses the ISO Latin-1 (ISO
***************
*** 2279,2351 ****
</para></listitem></varlistentry></variablelist>
<!-- #endif -->
- <!-- #if defined(NEXTSTEP_CHS) && !defined(UNICODE) -->
- <variablelist>
- <varlistentry><term><emphasis role="plat-dep">&nextstep; platforms
- only, and only in &clisp; built &without; compile-time flag
- &unicode;.</emphasis></term>
- <listitem><para>More precisely, &clisp; uses the &nextstep; character set:
- <informaltable id="next-charset-table" frame="all">
- <tgroup cols="17" colsep="1" rowsep="1" align="center">
- &char-table-header;<tbody>
- <row><entry>#x00</entry>&cc;&cc;&cc;&cc;&cc;&cc;&cc;&cc;&cc;&cc;&cc;
- &cc;&cc;&cc;&cc;&cc;</row>
- <row><entry>#x10</entry>&cc;&cc;&cc;&cc;&cc;&cc;&cc;&cc;&cc;&cc;&cc;
- &cc;&cc;&cc;&cc;&cc;</row>
- &ascii-printable;
- <row><entry>#x80</entry><entry> </entry><entry>À</entry>
- <entry>Á</entry><entry>Â</entry><entry>Ã</entry>
- <entry>Ä</entry><entry>Å</entry><entry>Ç</entry>
- <entry>È</entry><entry>É</entry><entry>Ê</entry>
- <entry>Ë</entry><entry>Ì</entry><entry>Í</entry>
- <entry>Î</entry><entry>Ï</entry></row>
- <row><entry>#x90</entry><entry>Ð</entry><entry>Ñ</entry>
- <entry>Ò</entry><entry>Ó</entry><entry>Ô</entry>
- <entry>Õ</entry><entry>Ö</entry><entry>Ù</entry>
- <entry>Ú</entry><entry>Û</entry><entry>Ü</entry>
- <entry>Ý</entry><entry>Þ</entry><entry>µ</entry>
- <entry>×</entry><entry>÷</entry></row>
- <row><entry>#xA0</entry><entry>©</entry><entry>¡</entry>
- <entry>¢</entry><entry>£</entry><entry>⁄</entry>
- <entry>¥</entry><entry>ƒ</entry><entry>§</entry>
- <entry>¤</entry><entry>’</entry><entry>“</entry>
- <entry>«</entry><entry>‹</entry><entry>›</entry>
- <entry>fi</entry><entry>fl</entry></row>
- <row><entry>#xB0</entry><entry>®</entry><entry>–</entry>
- <entry>†</entry><entry>‡</entry><entry>·</entry>
- <entry>¦</entry><entry>¶</entry><entry>•</entry>
- <entry>‚</entry><entry>„</entry><entry>”</entry>
- <entry>»</entry><entry>…</entry><entry>‰</entry>
- <entry>¬</entry><entry>¿</entry></row>
- <row><entry>#xC0</entry><entry>¹</entry><entry>ˋ</entry>
- <entry>´</entry><entry>ˆ</entry><entry>˜</entry>
- <entry>¯</entry><entry>˘</entry><entry>˙</entry>
- <entry>¨</entry><entry>²</entry><entry>˚</entry>
- <entry>¸</entry><entry>³</entry><entry>˝</entry>
- <entry>˛</entry><entry>ˇ</entry></row>
- <row><entry>#xD0</entry><entry>—</entry><entry>±</entry>
- <entry>¼</entry><entry>½</entry><entry>¾</entry>
- <entry>à</entry><entry>á</entry><entry>â</entry>
- <entry>ã</entry><entry>ä</entry><entry>å</entry>
- <entry>ç</entry><entry>è</entry><entry>é</entry>
- <entry>ê</entry><entry>ë</entry></row>
- <row><entry>#xE0</entry><entry>ì</entry><entry>Æ</entry>
- <entry>í</entry><entry>ª</entry><entry>î</entry>
- <entry>ï</entry><entry>ð</entry><entry>ñ</entry>
- <entry>Ł</entry><entry>Ø</entry><entry>Œ</entry>
- <entry>º</entry><entry>ò</entry><entry>ó</entry>
- <entry>ô</entry><entry>õ</entry></row>
- <row><entry>#xF0</entry><entry>ö</entry><entry>æ</entry>
- <entry>ù</entry><entry>ú</entry><entry>û</entry>
- <entry>ı</entry><entry>ü</entry><entry>ý</entry>
- <entry>ł</entry><entry>ø</entry><entry>œ</entry>
- <entry>ß</entry><entry>þ</entry><entry>ÿ</entry>
- <entry/><entry/></row>
- </tbody></tgroup></informaltable>
- &char-table-legend;
- </para></listitem></varlistentry></variablelist>
- <!-- #endif -->
-
<table id="standard-char-table" frame="all">
<title>Standard characters</title>
<tgroup cols="2" colsep="1" rowsep="1" align="center">
--- 2279,2284 ----
diff -c -3 -r1.142 charstrg.d
*** src/charstrg.d 4 May 2008 02:46:54 -0000 1.142
--- src/charstrg.d 31 May 2008 13:33:18 -0000
***************
*** 1,6 ****
/*
* Functions for characters and strings for CLISP
! * Bruno Haible 1990-2004
* Sam Steingold 1998-2008
* German comments translated into English: Stefan Kain 2002-09-20
*/
--- 1,6 ----
/*
* Functions for characters and strings for CLISP
! * Bruno Haible 1990-2008
* Sam Steingold 1998-2008
* German comments translated into English: Stefan Kain 2002-09-20
*/
***************
*** 24,34 ****
small CC CD DD CE CF EF E2 B7 EA D4 D7 D6 B5 EC E4 F1
CAP D8 A5 A7 DA DB EE E1 B6 E9 D0 D3 D2 B4 EB E3 F0
which äÄ ëË ïÏ öÖ üÜ ÿŸ ãà ñÑ õÕ åÅ æÆ øØ çÇ šŠ ðÐ þÞ */
- #elif defined(NEXTSTEP_CHS)
- /* here are the registered bijective case (small<-->CAP) transformations
- small 61 ... 7A D5 ... E0 E2 E4 ... E7 EC ... F0 F1 F2 .. F4 F6 F7 F9 FA FC
- CAP 41 ... 5A 81 ... 8C 8D 8E ... 91 92 ... 96 E1 97 .. 99 9A 9B E9 EA 9C
- which aA ... zZ àÀ ... ìÌ íÍ îÎ ... ñÑ òÒ ... öÖ æÆ ùÙ .. ûÛ üÜ ýÝ øØ œŒ þÞ */
#else /* defined(ASCII_CHS) */
/* here are the registered bijective case (small<-->CAP) transformations
small 61 ... 7A
--- 24,29 ----
***************
*** 106,129 ****
0xE0,0xE1,0xE1,0xE3,0xE3,0xE5,0xE6,0xE7,0xE8,0xE9,0xE9,0xEB,0xEB,0xED,0xEE,0xEE,
0xF0,0xF0,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
};
- #elif defined(NEXTSTEP_CHS)
- { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
- 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
- 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
- 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
- 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
- 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
- 0x60,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
- 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x7B,0x7C,0x7D,0x7E,0x7F,
- 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
- 0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
- 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
- 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
- 0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
- 0xD0,0xD1,0xD2,0xD3,0xD4,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,
- 0x8C,0xE1,0x8D,0xE3,0x8E,0x8F,0x90,0x91,0xE8,0xE9,0xEA,0xEB,0x92,0x93,0x94,0x95,
- 0x96,0xE1,0x97,0x98,0x99,0xF5,0x9A,0x9B,0xF8,0xE9,0xEA,0xFB,0x9C,0xFD,0xFE,0xFF,
- };
#else /* standard ascii conversion table: only a..z --> A..Z */
{ 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
--- 101,106 ----
***************
*** 195,218 ****
0xC4,0xE2,0xE2,0xE4,0xE4,0xD5,0xD9,0xC6,0xCA,0xEA,0xEA,0xEC,0xEC,0xC7,0xEF,0xEF,
0xF1,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
};
- #elif defined(NEXTSTEP_CHS)
- { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
- 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
- 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
- 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
- 0x40,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
- 0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x5B,0x5C,0x5D,0x5E,0x5F,
- 0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
- 0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
- 0x80,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,0xE0,0xE2,0xE4,0xE5,
- 0xE6,0xE7,0xEC,0xED,0xEE,0xEF,0xF0,0xF2,0xF3,0xF4,0xF6,0xF7,0xFC,0x9D,0x9E,0x9F,
- 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
- 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
- 0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
- 0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
- 0xE0,0xF1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xF9,0xFA,0xEB,0xEC,0xED,0xEE,0xEF,
- 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
- };
#else /* standard ascii conversion table: only A..Z --> a..z */
{ 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
--- 172,177 ----
***************
*** 265,272 ****
#elif defined(HPROMAN8_CHS)
/* or $A1 <= c <= $A7 or $AD <= c <= $AE or $B1 <= c <= $B7 except c=$B3
or $C0 <= c <= $F1. */
- #elif defined(NEXTSTEP_CHS)
- /* or $81 <= c <= $9D or $D5 <= c <= $FD. */
#endif
#endif
/* Therein, all uppercase- and all lowercase-
--- 224,229 ----
***************
*** 291,299 ****
} else {
if (c > 0xB7) goto no; if (c == 0xB3) goto no; else goto yes;
}
- #elif defined(NEXTSTEP_CHS)
- if (c < 0x81) goto no; if (c <= 0x9D) goto yes;
- if (c < 0xD5) goto no; if (c <= 0xFD) goto yes;
#endif
no: return false;
yes: return true;
--- 248,253 ----
***************
*** 336,344 ****
&& !(c < 0x0020 || (0x007F <= c <= 0x009F)) */
#elif defined(ISOLATIN_CHS) || defined(HPROMAN8_CHS)
/* $20 <= c <= $7E or $A0 <= c < $100. */
- #elif defined(NEXTSTEP_CHS)
- /* $20 <= c <= $7E or $80 <= c <= $A5 or c in {$A7,$A8,$AA,$AB,$AE..$B7}
- or $BA <= c <= $FD except c = $CD. */
#else /* defined(ASCII_CHS) */
/* $20 <= c <= $7E. */
#endif
--- 290,295 ----
***************
*** 351,366 ****
#else
#if defined(ISOLATIN_CHS) || defined(HPROMAN8_CHS)
if ((('~' >= c) && (c >= ' ')) || (c >= 0xA0)) goto yes; else goto no;
- #elif defined(NEXTSTEP_CHS)
- if (c <= '~') { if (c >= ' ') goto yes; else goto no; }
- if (c < 0xC0) {
- if (c < 0xA0) { if (c >= 0x80) goto yes; else goto no; }
- /* fetch bit c-0xA0 from the 32-bit-number
- %11111100111111111100110110111111: */
- if (0xFCFFCDBF & bit(c-0xA0)) goto yes; else goto no;
- } else {
- if ((c <= 0xFD) && !(c == 0xCD)) goto yes; else goto no;
- }
#else /* defined(ASCII_CHS) */
if (c >= ' ') goto yes; else goto no;
#endif
--- 302,307 ----
diff -c -3 -r1.252 eval.d
*** src/eval.d 27 May 2008 21:06:07 -0000 1.252
--- src/eval.d 31 May 2008 13:33:23 -0000
***************
*** 1,6 ****
/*
* EVAL, APPLY and bytecode interpreter for CLISP
! * Bruno Haible 1990-2005
* Sam Steingold 1998-2008
* German comments translated into English: Stefan Kain 2001-08-13
*/
--- 1,6 ----
/*
* EVAL, APPLY and bytecode interpreter for CLISP
! * Bruno Haible 1990-2008
* Sam Steingold 1998-2008
* German comments translated into English: Stefan Kain 2001-08-13
*/
***************
*** 5663,5669 ****
LR(x,f) references label with number x forwards
LR(x,b) references label with number x backwards
The scope of the labels is only one assembler-statement. */
! #if defined(I80386) && !defined(UNIX_NEXTSTEP)
#ifdef ASM_UNDERSCORE
#define LD(nr) "LASM%=X" STRING(nr)
#define LR(nr,fb) "LASM%=X" STRING(nr)
--- 5663,5669 ----
LR(x,f) references label with number x forwards
LR(x,b) references label with number x backwards
The scope of the labels is only one assembler-statement. */
! #if defined(I80386)
#ifdef ASM_UNDERSCORE
#define LD(nr) "LASM%=X" STRING(nr)
#define LR(nr,fb) "LASM%=X" STRING(nr)
diff -c -3 -r1.341 io.d
*** src/io.d 2 May 2008 20:51:26 -0000 1.341
--- src/io.d 31 May 2008 13:33:28 -0000
***************
*** 1,6 ****
/*
* Input/Output for CLISP
! * Bruno Haible 1990-2005
* Marcus Daniels 11.3.1997
* Sam Steingold 1998-2008
* German comments translated into English: Stefan Kain 2001-06-12
--- 1,6 ----
/*
* Input/Output for CLISP
! * Bruno Haible 1990-2008
* Marcus Daniels 11.3.1997
* Sam Steingold 1998-2008
* German comments translated into English: Stefan Kain 2001-06-12
***************
*** 232,254 ****
cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- #elif defined(NEXTSTEP_CHS)
- whsp,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
- cnst,cnst,cnst,cnst,cnst,cnst,cnst,cnst,
#else /* defined(ASCII_CHS) && !defined(UNICODE) */
illg,illg,illg,illg,illg,illg,illg,illg,
illg,illg,illg,illg,illg,illg,illg,illg,
--- 232,237 ----
***************
*** 1087,1110 ****
a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- #elif defined(NEXTSTEP_CHS)
- a_illg,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
- a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha, a_alpha,
#else /* defined(ASCII_CHS) && !defined(UNICODE) */
a_illg,
a_illg, a_illg, a_illg, a_illg, a_illg, a_illg, a_illg, a_illg,
--- 1070,1075 ----
diff -c -3 -r1.14 lightning.c
*** src/lightning.c 21 Mar 2008 15:38:45 -0000 1.14
--- src/lightning.c 31 May 2008 13:33:30 -0000
***************
*** 822,828 ****
/* LR(x,f) references label with number x forwards */
/* LR(x,b) references label with number x backwards */
/* The scope of the labels is only one assembler-statement. */
! #if defined(I80386) && !defined(UNIX_NEXTSTEP)
#ifdef ASM_UNDERSCORE
#define LD(nr) "LASM%=X" STRING(nr)
#define LR(nr,fb) "LASM%=X" STRING(nr)
--- 822,828 ----
/* LR(x,f) references label with number x forwards */
/* LR(x,b) references label with number x backwards */
/* The scope of the labels is only one assembler-statement. */
! #if defined(I80386)
#ifdef ASM_UNDERSCORE
#define LD(nr) "LASM%=X" STRING(nr)
#define LR(nr,fb) "LASM%=X" STRING(nr)
diff -c -3 -r1.786 lispbibl.d
*** src/lispbibl.d 31 May 2008 11:35:49 -0000 1.786
--- src/lispbibl.d 31 May 2008 13:33:39 -0000
***************
*** 291,299 ****
#ifdef AUX
#define UNIX_AUX /* Apple A/UX, a spiced-up SVR2 */
#endif
- #ifdef NeXT
- #define UNIX_NEXTSTEP /* NeXTstep */
- #endif
#if defined(__APPLE__) && defined(__MACH__)
#define UNIX_MACOSX /* MacOS X */
#endif
--- 291,296 ----
***************
*** 392,402 ****
#define HPROMAN8_CHS /* HP-Roman8, see hproman8.chs */
/* under X-Term however: #define ISOLATIN_CHS ?? */
#endif
! #ifdef UNIX_NEXTSTEP
! #undef ISOLATIN_CHS
! #define NEXTSTEP_CHS /* NeXTstep, see nextstep.chs */
! #endif
! #if !(defined(ISOLATIN_CHS) || defined(HPROMAN8_CHS) || defined(NEXTSTEP_CHS))
#define ASCII_CHS /* Default: plain ASCII charset without special chars */
#endif
--- 389,395 ----
#define HPROMAN8_CHS /* HP-Roman8, see hproman8.chs */
/* under X-Term however: #define ISOLATIN_CHS ?? */
#endif
! #if !(defined(ISOLATIN_CHS) || defined(HPROMAN8_CHS))
#define ASCII_CHS /* Default: plain ASCII charset without special chars */
#endif
***************
*** 2871,2878 ****
/* Now come the 32-bit platforms with TYPECODES. We need to support it only on
MC680X0 platforms without new gcc.
It worked on the following platforms in the past, and may still work on:
! (defined(MC680X0) && !defined(UNIX_AMIX) && !defined(UNIX_NEXTSTEP) && !(defined(UNIX_LINUX) && CODE_ADDRESS_RANGE))
! (defined(I80386) && !(defined(UNIX_LINUX) && (CODE_ADDRESS_RANGE != 0)) && !defined(UNIX_HURD) && !defined(UNIX_SYSV_UHC_1) && !defined(UNIX_NEXTSTEP) && !defined(UNIX_SYSV_PTX) && !defined(UNIX_SUNOS5) && !defined(UNIX_CYGWIN32) && !defined(WIN32_NATIVE))
(defined(SPARC) && !defined(SUN4_29))
(defined(MIPS) && !defined(UNIX_IRIX) && !defined(UNIX_DEC_ULTRIX))
defined(M88000)
--- 2864,2871 ----
/* Now come the 32-bit platforms with TYPECODES. We need to support it only on
MC680X0 platforms without new gcc.
It worked on the following platforms in the past, and may still work on:
! (defined(MC680X0) && !defined(UNIX_AMIX) && !(defined(UNIX_LINUX) && CODE_ADDRESS_RANGE))
! (defined(I80386) && !(defined(UNIX_LINUX) && (CODE_ADDRESS_RANGE != 0)) && !defined(UNIX_HURD) && !defined(UNIX_SYSV_UHC_1) && !defined(UNIX_SYSV_PTX) && !defined(UNIX_SUNOS5) && !defined(UNIX_CYGWIN32) && !defined(WIN32_NATIVE))
(defined(SPARC) && !defined(SUN4_29))
(defined(MIPS) && !defined(UNIX_IRIX) && !defined(UNIX_DEC_ULTRIX))
defined(M88000)
diff -c -3 -r1.750 makemake.in
*** src/makemake.in 31 May 2008 12:53:44 -0000 1.750
--- src/makemake.in 31 May 2008 13:33:41 -0000
***************
*** 1,6 ****
# -*- coding: utf-8; mode: shell-script -*- vim:filetype=sh
# Creation of the Makefile used for compiling CLISP
! # Bruno Haible 1991-2005
# Sam Steingold 1999-2008
# Simple usage:
--- 1,6 ----
# -*- coding: utf-8; mode: shell-script -*- vim:filetype=sh
# Creation of the Makefile used for compiling CLISP
! # Bruno Haible 1991-2008
# Sam Steingold 1999-2008
# Simple usage:
***************
*** 1626,1632 ****
NLS_INCLUDES=$NLS_INCLUDES' nls_cp1250 nls_cp1251 nls_cp1252 nls_cp1253'
NLS_INCLUDES=$NLS_INCLUDES' nls_cp1254 nls_cp1256 nls_cp1257'
NLS_INCLUDES=$NLS_INCLUDES' nls_hp_roman8'
- NLS_INCLUDES=$NLS_INCLUDES' nls_nextstep'
NLS_INCLUDES=$NLS_INCLUDES' nls_jisx0201'
fi
--- 1626,1631 ----
diff -c -3 -r1.91 misc.d
*** src/misc.d 22 Apr 2008 17:31:31 -0000 1.91
--- src/misc.d 31 May 2008 13:33:42 -0000
***************
*** 1,6 ****
/*
* Miscellaneous CLISP functions
! * Bruno Haible 1990-2005
* Sam Steingold 1999-2007
*/
--- 1,6 ----
/*
* Miscellaneous CLISP functions
! * Bruno Haible 1990-2008
* Sam Steingold 1999-2007
*/
***************
*** 133,140 ****
(read-line stream nil nil))) */
#if defined(UNIX_SUNOS4)
pushSTACK(ascii_to_string("/bin/arch"));
- #elif defined(UNIX_NEXTSTEP)
- pushSTACK(ascii_to_string("/usr/bin/arch"));
#else
pushSTACK(ascii_to_string("uname -m"));
#endif
--- 133,138 ----
diff -c -3 -r1.58 pseudofun.d
*** src/pseudofun.d 7 Nov 2007 03:41:21 -0000 1.58
--- src/pseudofun.d 31 May 2008 13:33:42 -0000
***************
*** 1,6 ****
/*
* List of all relocatable machine pointers
! * Bruno Haible 1990-2004
* Sam Steingold 2005, 2007
*/
--- 1,6 ----
/*
* List of all relocatable machine pointers
! * Bruno Haible 1990-2008
* Sam Steingold 2005, 2007
*/
***************
*** 217,223 ****
XPSEUDODATA(struct nls_table_t, nls_cp1256_table)
XPSEUDODATA(struct nls_table_t, nls_cp1257_table)
XPSEUDODATA(struct nls_table_t, nls_hp_roman8_table)
- XPSEUDODATA(struct nls_table_t, nls_nextstep_table)
XPSEUDODATA(struct nls_table_t, nls_jisx0201_table)
#ifdef HAVE_GOOD_ICONV
XPSEUDOCODE(uintL, iconv_mblen, (object encoding, const uintB* src, const uintB* srcend))
--- 217,222 ----
diff -c -3 -r1.430 spvw.d
*** src/spvw.d 25 May 2008 09:11:40 -0000 1.430
--- src/spvw.d 31 May 2008 13:33:44 -0000
***************
*** 2842,2860 ****
var uintM teil = free_reserved/teile; /* a sub block, a 1/16 of the room */
var aint ptr = memblock;
mem.MEMBOT = ptr;
- #ifdef UNIX_NEXTSTEP
- /* Set the stack size limit to 8 MB if possible to prevent
- crashes from machine stack overflow.
- (If the stack is large enough, the Lisp STACK will overflow
- first, and the error will be handled in a reasonable way.) */
- { var struct rlimit rl;
- var long need = 0x800000; /* 8 Megabyte */
- getrlimit(RLIMIT_STACK,&rl);
- if (rl.rlim_max < need) { need = rl.rlim_max; }
- if (rl.rlim_cur < need)
- { rl.rlim_cur = need; setrlimit(RLIMIT_STACK,&rl); }
- }
- #endif
#if defined(WIN32_NATIVE) && !defined(NO_SP_CHECK)
/* Even if the NOCOST_SP_CHECK stack overflow detection (using a
guard page) works, we set SP_bound.
--- 2842,2847 ----
diff -c -3 -r1.88 unix.d
*** src/unix.d 31 May 2008 13:15:23 -0000 1.88
--- src/unix.d 31 May 2008 13:33:44 -0000
***************
*** 61,71 ****
extern_C RETGETPAGESIZETYPE getpagesize (void); /* getpagesize(2) */
#endif
/* malloc(), free(), realloc() are defined in <stdlib.h> */
- #ifdef UNIX_NEXTSTEP
- /* ignore the contents of libposix.a, since it is not documented */
- #undef HAVE_MMAP
- #undef HAVE_MUNMAP
- #endif
#ifdef UNIX_RHAPSODY
/* Ignore mmap and friends, because the configure test says no working mmap. */
#undef HAVE_MMAP
--- 61,66 ----
***************
*** 123,129 ****
/* the headers for UNIX_NEXTSTEP must look indescribable ... */
#undef local
#include <mach/mach_interface.h>
! #if defined(UNIX_NEXTSTEP) || defined(UNIX_RHAPSODY)
#include <mach/mach_init.h>
#endif
#ifdef UNIX_OSF
--- 118,124 ----
/* the headers for UNIX_NEXTSTEP must look indescribable ... */
#undef local
#include <mach/mach_interface.h>
! #ifdef UNIX_RHAPSODY
#include <mach/mach_init.h>
#endif
#ifdef UNIX_OSF
***************
*** 193,205 ****
/* use madvise() ?? */
/* used by SPVW */
- /* make stack large enough */
- #ifdef UNIX_NEXTSTEP
- extern_C int getrlimit (RLIMIT_RESOURCE_T resource, struct rlimit * rlim); /* GETRLIMIT(2) */
- extern_C int setrlimit (RLIMIT_RESOURCE_T resource, SETRLIMIT_CONST struct rlimit * rlim); /* SETRLIMIT(2) */
- #endif
- /* used by SPVW */
-
/* normal program end */
nonreturning_function(extern_C, _exit, (int status)); /* EXIT(2V) */
nonreturning_function(extern_C, exit, (int status)); /* EXIT(2V) */
--- 188,193 ----
***************
*** 439,445 ****
#define Handle int /* the type of a file descriptor */
#define INVALID_HANDLE -1
extern_C off_t lseek (int fd, off_t offset, int whence); /* LSEEK(2V) */
! #ifndef SEEK_SET /* e.g., UNIX_NEXTSTEP */
/* position modes, see <unistd.h> : */
#define SEEK_SET 0
#define SEEK_CUR 1
--- 427,433 ----
#define Handle int /* the type of a file descriptor */
#define INVALID_HANDLE -1
extern_C off_t lseek (int fd, off_t offset, int whence); /* LSEEK(2V) */
! #ifndef SEEK_SET /* old platforms */
/* position modes, see <unistd.h> : */
#define SEEK_SET 0
#define SEEK_CUR 1
diff -c -3 -r1.50 PLATFORMS
*** unix/PLATFORMS 30 Oct 2007 21:35:36 -0000 1.50
--- unix/PLATFORMS 31 May 2008 13:33:45 -0000
***************
*** 548,562 ****
GNU gcc instead.
- * On NeXT running NeXTstep 3.3:
-
- NeXT's cc has problem with the inline assembler commands. Either add
- -DNO_ASM to the CFLAGS in the Makefile, or use gcc-2.7.2 or newer.
-
- If you get an error in the header file "ip.h" because the type `n_long' is
- undefined, add -Dn_long='unsigned long' to the CFLAGS in the Makefile.
-
-
* On Apple PowerPC running MacOS X Server:
You can get C development tools from either
--- 548,553 ----
diff -c -3 -r1.6 sigsegv.c
*** unix/sigsegv.c 31 May 2008 11:35:53 -0000 1.6
--- unix/sigsegv.c 31 May 2008 13:33:45 -0000
***************
*** 186,200 ****
#define WP_SIGNAL FAULT_HANDLER(SIGBUS)
#endif
- #if defined(NeXT) /* NextStep 3.2 */
- /* The fault address is not passed to the signal handler. To get the fault
- * address, a Mach exception handler has to be set up, which runs in a separate
- * thread.
- */
- #define WP_SIGNAL FAULT_HANDLER(SIGBUS)
- #define CAN_HANDLE_WP_FAULT
- #endif
-
#if 0
/* Ultrix ?? */
#define FAULT_HANDLER_ARGLIST sig, code, scp
--- 186,191 ----
***************
*** 325,347 ****
#endif
#endif
- #ifdef NeXT /* NeXTstep has Mach VM. */
- #include <sys/types.h>
- #include <sys/resource.h>
- #include <mach/mach.h>
- #include <mach/machine/vm_param.h>
- #define mmap(addr,len,prot,unused_flags,unused_fd,unused_off) \
- ({vm_address_t address = addr; \
- vm_allocate(task_self(),&address,len,!(addr)); \
- address; \
- })
- #define mprotect(addr,len,prot) \
- (vm_protect(task_self(),addr,len,0,prot)==KERN_SUCCESS ? 0 : -1)
- #define PROT_NONE 0
- #define PROT_READ VM_PROT_READ
- #define PROT_WRITE VM_PROT_WRITE
- #define PROT_EXEC VM_PROT_EXECUTE
- #else
#ifdef HAVE_MMAP
#include <sys/types.h>
#include <sys/mman.h>
--- 316,321 ----
***************
*** 350,356 ****
#else
#error "Need mprotect() for the test."
#endif
- #endif
#ifndef PROT_READ_WRITE
#define PROT_READ_WRITE PROT_READ | PROT_WRITE
--- 324,329 ----
diff -c -3 -r1.11 Makefile
*** utils/unicode/Makefile 27 May 2002 17:27:54 -0000 1.11
--- utils/unicode/Makefile 31 May 2008 13:33:45 -0000
***************
*** 72,78 ****
$(DESTDIR)nls_cp1256.c \
$(DESTDIR)nls_cp1257.c \
$(DESTDIR)nls_hp_roman8.c \
- $(DESTDIR)nls_nextstep.c \
$(DESTDIR)nls_jisx0201.c
CC = gcc -O -Wall
--- 72,77 ----
***************
*** 275,283 ****
$(DESTDIR)nls_hp_roman8.c : $(TABLESDIR)/glibc-2.1-iconv/HP-ROMAN8.TXT nls_table
./nls_table hp-roman8 nls_hp_roman8.c $(DESTDIR) < $<
- $(DESTDIR)nls_nextstep.c : $(TABLESDIR)/clisp/NEXTSTEP.TXT nls_table
- ./nls_table nextstep nls_nextstep.c $(DESTDIR) < $<
-
$(DESTDIR)nls_jisx0201.c : $(TABLESDIR)/clisp/JIS_X0201.TXT nls_table
./nls_table jisx0201 nls_jisx0201.c $(DESTDIR) < $<
--- 274,279 ----
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 14:05:44
|
While at it, there are more systems that are now museumware:
- Sun3 (SunOS 3.5, 4), sold before 1990
- Sun4 (under SunOS 4, but some under Solaris may survive), sold before 1994
- Sun386 (SunOS 4), sold around 1991
2008-05-31 Bruno Haible <br...@cl...>
Remove SunOS 4 support.
* lispbibl.d (SUN386, SUN3, UNIX_SUNOS4): Remove macros.
(MULTIMAP_MEMORY_VIA_FILE, hardware_addressbus_mask, SPVW_MIXED):
Update.
* unix.d: Drop UNIX_SUNOS4 conditional.
* spvw.d (init_memory): Likewise.
* misc.d (MACHINE-TYPE, MACHINE-VERSION): Likewise.
* _distmakefile (CC): Likewise.
* stream.d (MAKE-WINDOW, CLOSE-WINDOW): Drop SUN3 conditional.
diff -c -3 -r1.25 _distmakefile
*** src/_distmakefile 12 Jan 2006 21:49:02 -0000 1.25
--- src/_distmakefile 31 May 2008 13:58:54 -0000
***************
*** 39,45 ****
#ifdef UNIX_AIX
CC = xlc
#else
! #if defined(UNIX_SUNOS4) || defined(UNIX_CYGWIN32)
CC = gcc
#else
#ifdef UNIX_HPUX
--- 39,45 ----
#ifdef UNIX_AIX
CC = xlc
#else
! #ifdef UNIX_CYGWIN32
CC = gcc
#else
#ifdef UNIX_HPUX
*** src/ari68000.d 5 Feb 2001 19:29:42 -0000 1.3
--- src/ari68000.d 31 May 2008 13:58:54 -0000
***************
*** 1,5 ****
# Externe Routinen zu ARILEV1.D
! # Compiler: CC oder GNU-C auf SUN3 oder AMIGA
# Parameter-Übergabe:
# auf dem Stack: sp@(4), sp@(8), ... (.W-Größen belegen 4 Byte!),
# Rückgabewert in d0.
--- 1,5 ----
# Externe Routinen zu ARILEV1.D
! # Compiler: CC oder GNU-C auf AMIGA
# Parameter-Übergabe:
# auf dem Stack: sp@(4), sp@(8), ... (.W-Größen belegen 4 Byte!),
# Rückgabewert in d0.
*** src/ari68020.d 5 Feb 2001 19:29:42 -0000 1.4
--- src/ari68020.d 31 May 2008 13:58:55 -0000
***************
*** 1,7 ****
# Externe Routinen zu ARILEV1.D
# Prozessor: 680x0 mit x>=2
# Assembler-Syntax: meist "$" streichen, auf A/UX "$" durch "%" ersetzen
! # Compiler: CC oder GNU-C auf SUN3 oder AMIGA oder A/UX
# Parameter-Übergabe:
# auf dem Stack: sp@(4), sp@(8), ... (.W-Größen belegen 4 Byte!),
# Rückgabewert in d0.
--- 1,7 ----
# Externe Routinen zu ARILEV1.D
# Prozessor: 680x0 mit x>=2
# Assembler-Syntax: meist "$" streichen, auf A/UX "$" durch "%" ersetzen
! # Compiler: CC oder GNU-C auf AMIGA oder A/UX
# Parameter-Übergabe:
# auf dem Stack: sp@(4), sp@(8), ... (.W-Größen belegen 4 Byte!),
# Rückgabewert in d0.
*** src/lispbibl.d 31 May 2008 13:46:18 -0000 1.787
--- src/lispbibl.d 31 May 2008 13:59:04 -0000
***************
*** 120,134 ****
#define PC386 /* IBMPC-compatible with 80386/80486-processor */
#endif
#ifdef GENERIC_UNIX
- #if (defined(sun) && defined(unix) && defined(sun386))
- #define SUN386
- #endif
#if (defined(unix) && (defined(linux) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
#define PC386
#endif
- #if (defined(sun) && defined(unix) && defined(mc68020))
- #define SUN3
- #endif
#if (defined(sun) && defined(unix) && defined(sparc))
#define SUN4
#endif
--- 120,128 ----
***************
*** 352,360 ****
#if defined(UNIX) && defined(SIGNALBLOCK_BSD) && !defined(SIGNALBLOCK_SYSV)
#define UNIX_BSD /* BSD Unix */
#endif
- #if (defined(SUN3) || defined(SUN386) || defined(SUN4)) && defined(HAVE_MMAP) && defined(HAVE_VADVISE)
- #define UNIX_SUNOS4 /* Sun OS Version 4 */
- #endif
#if (defined(SUN4) || (defined(I80386) && defined(__svr4__) && defined(__sun))) && !defined(HAVE_VADVISE) /* && !defined(HAVE_GETPAGESIZE) */
#define UNIX_SUNOS5 /* Sun OS Version 5.[1-5] (Solaris 2) */
#endif
--- 346,351 ----
***************
*** 2989,2995 ****
#endif
! #if (oint_addr_shift == 0) && (addr_shift == 0) && defined(TYPECODES) && !defined(WIDE_SOFT) && !(defined(SUN3) && !defined(UNIX_SUNOS4) && !defined(WIDE_SOFT)) && !(defined(AMD64) && defined(UNIX_LINUX))
/* If the address bits are the lower ones and not WIDE_SOFT,
memory mapping may be possible. */
--- 2980,2986 ----
#endif
! #if (oint_addr_shift == 0) && (addr_shift == 0) && defined(TYPECODES) && !defined(WIDE_SOFT) && !(defined(AMD64) && defined(UNIX_LINUX))
/* If the address bits are the lower ones and not WIDE_SOFT,
memory mapping may be possible. */
***************
*** 3000,3012 ****
#define SINGLEMAP_MEMORY
#endif
- #if defined(UNIX_SUNOS4) && !defined(MULTIMAP_MEMORY) && !defined(SINGLEMAP_MEMORY) && !defined(NO_MULTIMAP_FILE)
- /* Access to Lisp-objects is done through memory-mapping: Each
- memory page can be accessed at several addresses. */
- #define MULTIMAP_MEMORY
- #define MULTIMAP_MEMORY_VIA_FILE
- #endif
-
#if defined(HAVE_SHM) && !defined(MULTIMAP_MEMORY) && !defined(SINGLEMAP_MEMORY) && !defined(NO_MULTIMAP_SHM)
/* Access to Lisp-objects is done through memory-mapping: Each
memory page can be accessed at several addresses. */
--- 2991,2996 ----
***************
*** 3959,3966 ****
/* What's really being sent from an address to the address-bus */
#if defined(MC68000)
#define hardware_ 0x00FFFFFFUL /* 68000 drops 8 */
- #elif defined(SUN3) && !defined(UNIX_SUNOS4)
- #define hardware_addressbus_mask 0x0FFFFFFFUL /* SUN3 unter SunOS 3.5 wirft 4 Bits weg */
#else
#define hardware_addressbus_mask ~0UL /* Default: nothing is dropped */
#endif
--- 3943,3948 ----
***************
*** 4281,4289 ****
/* SINGLEMAP_MEMORY -> Ony pure pages/blocks make sense, since
the address of a page determines the type of the objects it contains. */
#define SPVW_PURE
! #elif !defined(TYPECODES) || defined(MC68000) || defined(SUN3) || defined(SPVW_BLOCKS) || defined(TRIVIALMAP_MEMORY)
/* !TYPECODES -> there aren't real typecodes, only Cons and Varobject.
! MC68000 or SUN3 -> type_pointable(...) costs little or nothing.
SPVW_BLOCKS -> SPVW_PURE_BLOCKS is only implemented for SINGLEMAP_MEMORY.
TRIVIALMAP_MEMORY -> not many blocks available, small adress space. */
#define SPVW_MIXED
--- 4263,4271 ----
/* SINGLEMAP_MEMORY -> Ony pure pages/blocks make sense, since
the address of a page determines the type of the objects it contains. */
#define SPVW_PURE
! #elif !defined(TYPECODES) || defined(MC68000) || defined(SPVW_BLOCKS) || defined(TRIVIALMAP_MEMORY)
/* !TYPECODES -> there aren't real typecodes, only Cons and Varobject.
! MC68000 -> type_pointable(...) costs little or nothing.
SPVW_BLOCKS -> SPVW_PURE_BLOCKS is only implemented for SINGLEMAP_MEMORY.
TRIVIALMAP_MEMORY -> not many blocks available, small adress space. */
#define SPVW_MIXED
*** src/misc.d 31 May 2008 13:46:18 -0000 1.92
--- src/misc.d 31 May 2008 13:59:04 -0000
***************
*** 131,141 ****
(string-upcase
(with-open-stream (stream (make-pipe-input-stream "/bin/arch"))
(read-line stream nil nil))) */
- #if defined(UNIX_SUNOS4)
- pushSTACK(ascii_to_string("/bin/arch"));
- #else
pushSTACK(ascii_to_string("uname -m"));
- #endif
funcall(L(make_pipe_input_stream),1); /* (MAKE-PIPE-INPUT-STREAM "/bin/arch") */
pushSTACK(value1); /* save stream */
pushSTACK(value1); pushSTACK(NIL); pushSTACK(NIL);
--- 131,137 ----
***************
*** 185,195 ****
(string-upcase
(with-open-stream (stream (make-pipe-input-stream "/bin/arch -k"))
(read-line stream nil nil))) */
- #if defined(UNIX_SUNOS4)
- pushSTACK(ascii_to_string("/bin/arch -k"));
- #else
pushSTACK(ascii_to_string("uname -m"));
- #endif
funcall(L(make_pipe_input_stream),1); /* (MAKE-PIPE-INPUT-STREAM "/bin/arch -k") */
pushSTACK(value1); /* save stream */
pushSTACK(value1); pushSTACK(NIL); pushSTACK(NIL);
--- 181,187 ----
*** src/spvw.d 31 May 2008 13:46:18 -0000 1.431
--- src/spvw.d 31 May 2008 13:59:06 -0000
***************
*** 195,204 ****
#if defined(SPVW_BLOCKS) && defined(SPVW_PURE) /* e.g. UNIX_LINUX, Linux 0.99.7 */
#define SPVW_PURE_BLOCKS
#endif
! #if defined(SPVW_PAGES) && defined(SPVW_MIXED) /* e.g. SUN3, HP9000_800 */
#define SPVW_MIXED_PAGES
#endif
! #if defined(SPVW_PAGES) && defined(SPVW_PURE) /* e.g. SUN4, SUN386 */
#define SPVW_PURE_PAGES
#endif
--- 195,204 ----
#if defined(SPVW_BLOCKS) && defined(SPVW_PURE) /* e.g. UNIX_LINUX, Linux 0.99.7 */
#define SPVW_PURE_BLOCKS
#endif
! #if defined(SPVW_PAGES) && defined(SPVW_MIXED) /* e.g. HP9000_800 */
#define SPVW_MIXED_PAGES
#endif
! #if defined(SPVW_PAGES) && defined(SPVW_PURE) /* e.g. SUN4 */
#define SPVW_PURE_PAGES
#endif
***************
*** 2574,2587 ****
if (memneed > RESERVE_FOR_MALLOC*3/4) { memneed = RESERVE_FOR_MALLOC*3/4; }
VAROUT(memneed);
#endif
! #if defined(MULTIMAP_MEMORY_VIA_SHM) && (defined(UNIX_SUNOS4) || defined(UNIX_SUNOS5))
/* SunOS 4 refuses to shmat() into a previously malloc-ed region,
even if there is a munmap() inbetween:
errno = EINVAL. Also the reverse, first to shmat() and then to
merge the occupied region with sbrk() or brk() into the
data segment, fails with errno = ENOMEM.
The only way out is to fetch the necessary memory from far,
! if possible, out of reach of malloc() . */
{
var uintM memhave = round_down(bit(oint_addr_len)-(aint)sbrk(0),SHMLBA);
VAROUT(memhave);
--- 2574,2588 ----
if (memneed > RESERVE_FOR_MALLOC*3/4) { memneed = RESERVE_FOR_MALLOC*3/4; }
VAROUT(memneed);
#endif
! #if defined(MULTIMAP_MEMORY_VIA_SHM) && defined(UNIX_SUNOS5)
/* SunOS 4 refuses to shmat() into a previously malloc-ed region,
even if there is a munmap() inbetween:
errno = EINVAL. Also the reverse, first to shmat() and then to
merge the occupied region with sbrk() or brk() into the
data segment, fails with errno = ENOMEM.
The only way out is to fetch the necessary memory from far,
! if possible, out of reach of malloc() .
! SunOS 5 is probably the same. */
{
var uintM memhave = round_down(bit(oint_addr_len)-(aint)sbrk(0),SHMLBA);
VAROUT(memhave);
*** src/stream.d 31 May 2008 11:35:51 -0000 1.608
--- src/stream.d 31 May 2008 13:59:14 -0000
***************
*** 12356,12362 ****
begin_system_call();
initscr(); /* initialize Curses - What, if this crashes?? use newterm()?? */
cbreak(); noecho(); /* Input not line-buffered, without Echo */
! #if defined(SUN3) || defined(SUN4)
keypad(stdscr,true); /* activate Function-Key-Detection */
#endif
end_system_call();
--- 12356,12362 ----
begin_system_call();
initscr(); /* initialize Curses - What, if this crashes?? use newterm()?? */
cbreak(); noecho(); /* Input not line-buffered, without Echo */
! #ifdef SUN4
keypad(stdscr,true); /* activate Function-Key-Detection */
#endif
end_system_call();
***************
*** 12367,12373 ****
local void close_window (object stream, uintB abort) {
begin_system_call();
nocbreak(); echo(); /* Input is line-buffered again, with Echo */
! #if defined(SUN3) || defined(SUN4)
keypad(stdscr,false); /* deactivate Function-Key-Detection again */
#endif
endwin(); /* deactivate Curses */
--- 12367,12373 ----
local void close_window (object stream, uintB abort) {
begin_system_call();
nocbreak(); echo(); /* Input is line-buffered again, with Echo */
! #ifdef SUN4
keypad(stdscr,false); /* deactivate Function-Key-Detection again */
#endif
endwin(); /* deactivate Curses */
*** src/unix.d 31 May 2008 13:46:18 -0000 1.89
--- src/unix.d 31 May 2008 13:59:15 -0000
***************
*** 74,80 ****
#define MAP_ANON MAP_ANONYMOUS
#define HAVE_MMAP_ANON
#endif
! #if defined(UNIX_SUNOS4) || defined(UNIX_SUNOS5)
/* for SINGLEMAP_MEMORY: */
#if defined(HAVE_MMAP_DEVZERO_SUN4_29) && defined(SUN4_29) && !defined(HAVE_MMAP_DEVZERO)
/* On the assumption of the SUN4_29-type code distribution
--- 74,80 ----
#define MAP_ANON MAP_ANONYMOUS
#define HAVE_MMAP_ANON
#endif
! #ifdef UNIX_SUNOS5
/* for SINGLEMAP_MEMORY: */
#if defined(HAVE_MMAP_DEVZERO_SUN4_29) && defined(SUN4_29) && !defined(HAVE_MMAP_DEVZERO)
/* On the assumption of the SUN4_29-type code distribution
***************
*** 92,99 ****
#endif
#ifdef HAVE_MSYNC
#ifdef MS_INVALIDATE
! /* tested only on UNIX_LINUX, not UNIX_SUNOS4, not UNIX_SUNOS5,
! not UNIX_FREEBSD. ?? */
/* for MULTIMAP_MEMORY_VIA_FILE: */
/* extern_C int msync (void* addr, size_t len, int flags); */
#else
--- 92,98 ----
#endif
#ifdef HAVE_MSYNC
#ifdef MS_INVALIDATE
! /* tested only on UNIX_LINUX, not UNIX_SUNOS5, not UNIX_FREEBSD. ?? */
/* for MULTIMAP_MEMORY_VIA_FILE: */
/* extern_C int msync (void* addr, size_t len, int flags); */
#else
***************
*** 102,108 ****
#endif
#endif
/* for MULTIMAP_MEMORY_VIA_FILE: */
! #if defined(UNIX_SUNOS4) || defined(UNIX_LINUX) || defined(UNIX_FREEBSD)
#if HAVE_SYS_STATVFS_H
#include <sys/statvfs.h>
#elif HAVE_SYS_STATFS_H
--- 101,107 ----
#endif
#endif
/* for MULTIMAP_MEMORY_VIA_FILE: */
! #if defined(UNIX_LINUX) || defined(UNIX_FREEBSD)
#if HAVE_SYS_STATVFS_H
#include <sys/statvfs.h>
#elif HAVE_SYS_STATFS_H
***************
*** 170,176 ****
#if defined(UNIX_LINUX) && !defined(UNIX_GNU)
#include <asm/page.h> /* for SHMLBA on Linux 2.0 */
#endif
! #if defined(UNIX_SUNOS4) || defined(UNIX_SUNOS5)
#define SHMMAX 0x100000 /* maximum shared memory segment size = 1 MB */
#endif
#ifndef SHMMAX
--- 169,175 ----
#if defined(UNIX_LINUX) && !defined(UNIX_GNU)
#include <asm/page.h> /* for SHMLBA on Linux 2.0 */
#endif
! #ifdef UNIX_SUNOS5
#define SHMMAX 0x100000 /* maximum shared memory segment size = 1 MB */
#endif
#ifndef SHMMAX
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 14:15:43
|
Sam wrote:
> 4 -rw-rw-r-- 1 sds src 717 Aug 2 2003 offsetof.m4
This can go as well. All systems have <stddef.h>, and it always defines
offsetof correctly nowadays.
2008-05-31 Bruno Haible <br...@cl...>
* configure.in: Remove CL_OFFSETOF invocation.
* m4/intparam.m4 (CL_INTPARAM_ALIGNOF): Don't require CL_OFFSETOF.
Include <stddef.h> always.
* lispbibl.d: Include <stddef.h> always.
(offsetof): Don't redefine, use if it is defined.
* m4/offsetof.m4: Remove file.
diff -c -3 -r1.145 configure.in
*** src/configure.in 31 May 2008 13:15:23 -0000 1.145
--- src/configure.in 31 May 2008 14:11:23 -0000
***************
*** 79,85 ****
dnl
BOLD_MSG([checks for header files])
AC_CHECK_HEADERS(sys/inttypes.h unistd.h sys/file.h)
- CL_OFFSETOF dnl DEFS HAVE_OFFSETOF if offsetof in stddef.h
CL_OPENFLAGS dnl DEFS OPEN_NEEDS_SYS_FILE_H if sys/file.h is needed for the open() flags
CL_UTSNAME dnl DEFS HAVE_SYS_UTSNAME_H
CL_SHM_H dnl DEFS HAVE_SYS_IPC_H, HAVE_SYS_SHM_H
--- 79,84 ----
diff -c -3 -r1.788 lispbibl.d
*** src/lispbibl.d 31 May 2008 14:06:37 -0000 1.788
--- src/lispbibl.d 31 May 2008 14:11:32 -0000
***************
*** 1235,1244 ****
/* Determine the offset of a component 'ident' in a struct of the type 'type':
See 0 as pointer to 'type', put a struct 'type' there and determine the
address of its component 'ident' and return it as number: */
! #if defined(HAVE_OFFSETOF) || defined(__MINGW32__) || (defined(BORLAND) && defined(WIN32)) || defined(MICROSOFT)
! #include <stddef.h>
! #else
! #undef offsetof
#define offsetof(type,ident) ((ULONG)&(((type*)0)->ident))
#endif
/* Determine the offset of an array 'ident' in a struct of the type 'type': */
--- 1235,1242 ----
/* Determine the offset of a component 'ident' in a struct of the type 'type':
See 0 as pointer to 'type', put a struct 'type' there and determine the
address of its component 'ident' and return it as number: */
! #include <stddef.h>
! #ifndef offsetof
#define offsetof(type,ident) ((ULONG)&(((type*)0)->ident))
#endif
/* Determine the offset of an array 'ident' in a struct of the type 'type': */
diff -c -3 -r1.11 intparam.m4
*** src/m4/intparam.m4 29 May 2008 16:05:29 -0000 1.11
--- src/m4/intparam.m4 31 May 2008 14:11:33 -0000
***************
*** 1,4 ****
! # intparam.m4 serial 2 -*- Autoconf -*-
dnl Copyright (C) 2005-2008 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # intparam.m4 serial 3 -*- Autoconf -*-
dnl Copyright (C) 2005-2008 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
***************
*** 279,292 ****
dnl CL_INTPARAM_ALIGNOF(type, variable)
dnl puts into variable the determined alignment of the type.
AC_DEFUN([CL_INTPARAM_ALIGNOF],[
- AC_REQUIRE([CL_OFFSETOF])
dnl Simplify the guessing by assuming that the alignment is a power of 2.
n=1
while true; do
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
! #ifdef HAVE_OFFSETOF
! # include <stddef.h>
! #endif
#ifdef __cplusplus
# ifdef __GNUC__
# define alignof(type) __alignof__ (type)
--- 279,289 ----
dnl CL_INTPARAM_ALIGNOF(type, variable)
dnl puts into variable the determined alignment of the type.
AC_DEFUN([CL_INTPARAM_ALIGNOF],[
dnl Simplify the guessing by assuming that the alignment is a power of 2.
n=1
while true; do
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
! #include <stddef.h>
#ifdef __cplusplus
# ifdef __GNUC__
# define alignof(type) __alignof__ (type)
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 14:57:11
|
Sam wrote:
> 4 -rw-rw-r-- 1 sds src 1312 Aug 2 2003 openflags.m4
Not needed any more: <fcntl.h> is sufficient nowadays.
2008-05-31 Bruno Haible <br...@cl...>
* configure.in: Remove CL_OPENFLAGS invocation.
* unix.d: Assume O_RDWR etc. is defined in <fcntl.h>.
* m4/filecharset.m4 (CL_FILECHARSET): Likewise.
* m4/general.m4 (CL_FFCALL_COMMON_TRAMPOLINE): Likewise.
* m4/ioctl.m4 (CL_IOCTL): Likewise.
* m4/mmap.m4 (CL_MMAP): Likewise.
* m4/poll.m4 (CL_POLL): Likewise.
* m4/select.m4 (CL_SELECT): Likewise.
* m4/openflags.m4: Remove file.
diff -c -3 -r1.146 configure.in
*** src/configure.in 31 May 2008 14:16:28 -0000 1.146
--- src/configure.in 31 May 2008 14:51:46 -0000
***************
*** 79,85 ****
dnl
BOLD_MSG([checks for header files])
AC_CHECK_HEADERS(sys/inttypes.h unistd.h sys/file.h)
- CL_OPENFLAGS dnl DEFS OPEN_NEEDS_SYS_FILE_H if sys/file.h is needed for the open() flags
CL_UTSNAME dnl DEFS HAVE_SYS_UTSNAME_H
CL_SHM_H dnl DEFS HAVE_SYS_IPC_H, HAVE_SYS_SHM_H
CL_TERM dnl DEFS HAVE_TERMIOS_H, HAVE_TERMIO_H, ..., HAVE_SGTTY_H
--- 79,84 ----
diff -c -3 -r1.90 unix.d
*** src/unix.d 31 May 2008 14:06:40 -0000 1.90
--- src/unix.d 31 May 2008 14:51:47 -0000
***************
*** 409,419 ****
/* used by PATHNAME */
/* work with open files: */
! #include <fcntl.h> /* declares open() */
/* #include <unistd.h> - declares R_OK, W_OK, X_OK - included above */
- #if defined(OPEN_NEEDS_SYS_FILE_H)
- #include <sys/file.h>
- #endif
/* Only a few Unices (like UNIX_CYGWIN32) have O_TEXT and O_BINARY.
BeOS 5 has them, but they have no effect. */
#ifdef UNIX_BEOS
--- 409,416 ----
/* used by PATHNAME */
/* work with open files: */
! #include <fcntl.h> /* declares open(), O_RDWR etc. */
/* #include <unistd.h> - declares R_OK, W_OK, X_OK - included above */
/* Only a few Unices (like UNIX_CYGWIN32) have O_TEXT and O_BINARY.
BeOS 5 has them, but they have no effect. */
#ifdef UNIX_BEOS
diff -c -3 -r1.8 filecharset.m4
*** src/m4/filecharset.m4 29 May 2008 22:18:46 -0000 1.8
--- src/m4/filecharset.m4 31 May 2008 14:51:47 -0000
***************
*** 28,36 ****
#include <stdio.h>
/* Declare open(). */
#include <fcntl.h>
- #ifdef OPEN_NEEDS_SYS_FILE_H
- #include <sys/file.h>
- #endif
/* Declare opendir(), readdir(), closedir(). */
#include <dirent.h>
/* A small program which checks for each character whether or not it is
--- 28,33 ----
diff -c -3 -r1.22 general.m4
*** src/m4/general.m4 31 May 2008 12:28:56 -0000 1.22
--- src/m4/general.m4 31 May 2008 14:51:47 -0000
***************
*** 35,41 ****
[AC_REQUIRE([AC_HEADER_STDC])dnl
AC_REQUIRE([CL_GETPAGESIZE])dnl
AC_REQUIRE([CL_MACH_VM])dnl
- AC_REQUIRE([CL_OPENFLAGS])dnl
AC_REQUIRE([CL_MMAP])dnl
AC_REQUIRE([CL_MPROTECT])dnl
AC_REQUIRE([CL_SHM_H])dnl
--- 35,40 ----
diff -c -3 -r1.12 ioctl.m4
*** src/m4/ioctl.m4 20 Jun 2007 15:02:17 -0000 1.12
--- src/m4/ioctl.m4 31 May 2008 14:51:47 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2004, 2007 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2004, 2007-2008 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
***************
*** 12,18 ****
AC_DEFUN([CL_IOCTL],
[AC_REQUIRE([CL_TERM])dnl
- AC_REQUIRE([CL_OPENFLAGS])dnl
AC_REQUIRE([CL_CADDR_T])dnl
AC_CHECK_FUNCS(ioctl)
if test $ac_cv_func_ioctl = yes; then
--- 12,17 ----
***************
*** 127,135 ****
#endif
/* Declare open(). */
#include <fcntl.h>
- #ifdef OPEN_NEEDS_SYS_FILE_H
- #include <sys/file.h>
- #endif
int main ()
{ int fd = open("conftest.c",O_RDONLY,0644);
unsigned long bytes_ready;
--- 126,131 ----
diff -c -3 -r1.5 mmap.m4
*** src/m4/mmap.m4 14 Feb 2005 12:24:51 -0000 1.5
--- src/m4/mmap.m4 31 May 2008 14:51:47 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2005 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2008 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
***************
*** 11,18 ****
AC_PREREQ(2.57)
AC_DEFUN([CL_MMAP],
! [AC_REQUIRE([CL_OPENFLAGS])dnl
! AC_BEFORE([$0], [CL_MUNMAP])AC_BEFORE([$0], [CL_MPROTECT])
AC_CHECK_HEADER(sys/mman.h, , no_mmap=1)dnl
if test -z "$no_mmap"; then
AC_CHECK_FUNC(mmap, , no_mmap=1)dnl
--- 11,17 ----
AC_PREREQ(2.57)
AC_DEFUN([CL_MMAP],
! [AC_BEFORE([$0], [CL_MUNMAP])AC_BEFORE([$0], [CL_MPROTECT])
AC_CHECK_HEADER(sys/mman.h, , no_mmap=1)dnl
if test -z "$no_mmap"; then
AC_CHECK_FUNC(mmap, , no_mmap=1)dnl
***************
*** 38,46 ****
#include <unistd.h>
#endif
#include <fcntl.h>
- #ifdef OPEN_NEEDS_SYS_FILE_H
- #include <sys/file.h>
- #endif
#include <sys/types.h>
#include <sys/mman.h>
int main () {
--- 37,42 ----
diff -c -3 -r1.3 poll.m4
*** src/m4/poll.m4 23 Oct 2005 00:47:50 -0000 1.3
--- src/m4/poll.m4 31 May 2008 14:51:47 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 2004-2005 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 2004-2008 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
***************
*** 11,18 ****
AC_PREREQ(2.57)
AC_DEFUN([CL_POLL],
! [AC_REQUIRE([CL_OPENFLAGS])dnl
! AC_CHECK_FUNC(poll,
[# Check whether poll() works on special files (like /dev/null)
# and ttys (like /dev/tty). On MacOS X 10.4.0, it doesn't.
AC_TRY_RUN([
--- 11,17 ----
AC_PREREQ(2.57)
AC_DEFUN([CL_POLL],
! [AC_CHECK_FUNC(poll,
[# Check whether poll() works on special files (like /dev/null)
# and ttys (like /dev/tty). On MacOS X 10.4.0, it doesn't.
AC_TRY_RUN([
***************
*** 62,70 ****
#include <poll.h>
/* Declare open(). */
#include <fcntl.h>
- #ifdef OPEN_NEEDS_SYS_FILE_H
- #include <sys/file.h>
- #endif
/* Declare lseek(). */
#ifdef HAVE_UNISTD_H
#include <unistd.h>
--- 61,66 ----
diff -c -3 -r1.8 select.m4
*** src/m4/select.m4 20 Jun 2007 15:02:17 -0000 1.8
--- src/m4/select.m4 31 May 2008 14:51:47 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2004, 2007 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2004, 2007-2008 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
***************
*** 35,42 ****
])
AC_DEFUN([CL_SELECT],
! [AC_REQUIRE([CL_OPENFLAGS])dnl
! dnl Not AC_CHECK_FUNCS(select) because it doesn't work when CC=g++.
AC_CACHE_CHECK([for select], ac_cv_func_select, [
AC_TRY_LINK([
#ifdef __BEOS__
--- 35,41 ----
])
AC_DEFUN([CL_SELECT],
! [dnl Not AC_CHECK_FUNCS(select) because it doesn't work when CC=g++.
AC_CACHE_CHECK([for select], ac_cv_func_select, [
AC_TRY_LINK([
#ifdef __BEOS__
***************
*** 120,128 ****
#endif
/* Declare open(). */
#include <fcntl.h>
- #ifdef OPEN_NEEDS_SYS_FILE_H
- #include <sys/file.h>
- #endif
int main ()
{ int fd = open("conftest.c",O_RDWR,0644);
int correct_readability_nonempty, correct_readability_empty;
--- 119,124 ----
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 19:56:09
|
Sam wrote:
> 4 -rw-rw-r-- 1 sds src 672 Aug 2 2003 raise.m4
All platforms nowadays have raise() as well.
2008-05-31 Bruno Haible <br...@cl...>
* configure.in: Remove CL_RAISE invocation.
* unix.d (raise): Assume 'raise' exists.
* spvw_sigpipe.d (sigpipe_handler): Likewise.
* m4/raise.m4: Remove file.
diff -c -3 -r1.147 configure.in
*** src/configure.in 31 May 2008 14:55:49 -0000 1.147
--- src/configure.in 31 May 2008 19:53:27 -0000
***************
*** 109,115 ****
CL_SIGACTION_REINSTALL dnl DEFS SIGACTION_NEED_REINSTALL
CL_SIGACTION_UNBLOCK dnl DEFS SIGACTION_NEED_UNBLOCK
CL_SIGINTERRUPT dnl DEFS HAVE_SIGINTERRUPT, HAVE_SIGVEC
- CL_RAISE dnl DEFS HAVE_RAISE
CL_PERROR dnl DEFS HAVE_PERROR_DECL
AC_CHECK_FUNCS(strerror sysconf getdtablesize memset setsid setpgid fchmod dnl
fsync flock gethostent shutdown usleep ualarm setitimer nice ftime realpath dnl
--- 109,114 ----
diff -c -3 -r1.5 spvw_sigpipe.d
*** src/spvw_sigpipe.d 28 Aug 2003 18:34:24 -0000 1.5
--- src/spvw_sigpipe.d 31 May 2008 19:53:27 -0000
***************
*** 43,53 ****
/* Revert to the default handler and re-raise the signal.
This should be sufficient to kill us. */
SIGNAL(SIGPIPE,SIG_DFL);
- #if !(defined(UNIX) && !defined(HAVE_RAISE))
raise(SIGPIPE);
- #else
- kill(getpid(),SIGPIPE);
- #endif
}
#if !defined(RELY_ON_WRITING_TO_SUBPROCESS)
--- 43,49 ----
diff -c -3 -r1.91 unix.d
*** src/unix.d 31 May 2008 14:55:49 -0000 1.91
--- src/unix.d 31 May 2008 19:53:28 -0000
***************
*** 288,296 ****
and not into possibly mprotect-protected ranges. */
#endif
/* raise a signal. */
- #ifdef HAVE_RAISE
extern_C int raise (int sig);
- #endif
/* used by SPVW */
/* check environment variables:
--- 288,294 ----
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 20:03:39
|
The AC_C_RESTRICT macro in autoconf now takes care to choose a 'restrict' replacement that works in both C and C++ modes. We can drop our 2005 copy of that macro. 2008-05-31 Bruno Haible <br...@cl...> * modules/regexp/configure.in: Require autoconf >= 2.58. Invoke AC_C_RESTRICT instead of gl_C_RESTRICT. * m4/restrict.m4: Remove file. diff -c -3 -r1.32 configure.in *** modules/regexp/configure.in 22 May 2008 18:26:59 -0000 1.32 --- modules/regexp/configure.in 31 May 2008 20:00:34 -0000 *************** *** 2,8 **** dnl Bruno Haible 18.4.1995 dnl Sam Steingold 2003-2008 ! AC_PREREQ(2.57) AC_INIT(regexp, 1.0, clisp-list) AC_CONFIG_SRCDIR(regexp.lisp) AC_CONFIG_AUX_DIR(../../src/build-aux) --- 2,8 ---- dnl Bruno Haible 18.4.1995 dnl Sam Steingold 2003-2008 ! AC_PREREQ(2.58) AC_INIT(regexp, 1.0, clisp-list) AC_CONFIG_SRCDIR(regexp.lisp) AC_CONFIG_AUX_DIR(../../src/build-aux) *************** *** 12,18 **** BOLD_MSG([Regexp (Common)]) CL_MODULE_COMMON_CHECKS AC_CHECK_HEADERS(string.h sys/types.h) ! gl_C_RESTRICT dnl called from top-level configure.in:gl_INIT [gl_FUNC_ALLOCA gl_REGEX] --- 12,18 ---- BOLD_MSG([Regexp (Common)]) CL_MODULE_COMMON_CHECKS AC_CHECK_HEADERS(string.h sys/types.h) ! AC_C_RESTRICT dnl called from top-level configure.in:gl_INIT [gl_FUNC_ALLOCA gl_REGEX] |
|
From: Bruno H. <br...@cl...> - 2008-05-31 20:10:23
|
Part of select.m4 is unused. 2008-05-31 Bruno Haible <br...@cl...> * src/m4/select.m4 (RL_SELECT): Remove macro. diff -c -3 -r1.9 select.m4 *** src/m4/select.m4 31 May 2008 14:55:50 -0000 1.9 --- src/m4/select.m4 31 May 2008 20:09:28 -0000 *************** *** 10,39 **** AC_PREREQ(2.57) - AC_DEFUN([RL_SELECT], - [dnl Not AC_CHECK_FUNCS(select) because it doesn't work when CC=g++. - AC_CACHE_CHECK([for select], ac_cv_func_select, [ - AC_TRY_LINK([#include <sys/time.h> - ]AC_LANG_EXTERN[ - #ifdef __cplusplus - int select(int, fd_set*, fd_set*, fd_set*, struct timeval *); - #else - int select(); - #endif - ], [select(0,(fd_set*)0,(fd_set*)0,(fd_set*)0,(struct timeval *)0);], - ac_cv_func_select=yes, ac_cv_func_select=no)]) - if test $ac_cv_func_select = yes; then - AC_DEFINE(HAVE_SELECT, 1, [Define if you have the select() function.]) - CL_COMPILE_CHECK([sys/select.h], cl_cv_header_sys_select_h, - [#ifdef __BEOS__ - #include <sys/socket.h> - #endif - #include <sys/time.h> - #include <sys/select.h>], , - AC_DEFINE(HAVE_SYS_SELECT_H,,[have <sys/select.h>?]))dnl - fi - ]) - AC_DEFUN([CL_SELECT], [dnl Not AC_CHECK_FUNCS(select) because it doesn't work when CC=g++. AC_CACHE_CHECK([for select], ac_cv_func_select, [ --- 10,15 ---- |
|
From: Bruno H. <br...@cl...> - 2008-05-31 20:24:51
|
Sam wrote:
> 4 -rw-rw-r-- 1 sds src 695 Aug 2 2003 siginterrupt.m4
The test for sigvec is unnecessary: The last known platform that had
sigvec but not sigaction was SunOS 4. Long dead already.
2008-05-31 Bruno Haible <br...@cl...>
* m4/siginterrupt.m4 (CL_SIGINTERRUPT): Don't test for sigvec.
* unixaux.d (siginterrupt): Remove sigvec based emulation.
diff -c -3 -r1.148 configure.in
*** src/configure.in 31 May 2008 19:56:48 -0000 1.148
--- src/configure.in 31 May 2008 20:21:40 -0000
***************
*** 108,114 ****
CL_SIGACTION dnl DEFS HAVE_SIGACTION
CL_SIGACTION_REINSTALL dnl DEFS SIGACTION_NEED_REINSTALL
CL_SIGACTION_UNBLOCK dnl DEFS SIGACTION_NEED_UNBLOCK
! CL_SIGINTERRUPT dnl DEFS HAVE_SIGINTERRUPT, HAVE_SIGVEC
CL_PERROR dnl DEFS HAVE_PERROR_DECL
AC_CHECK_FUNCS(strerror sysconf getdtablesize memset setsid setpgid fchmod dnl
fsync flock gethostent shutdown usleep ualarm setitimer nice ftime realpath dnl
--- 108,114 ----
CL_SIGACTION dnl DEFS HAVE_SIGACTION
CL_SIGACTION_REINSTALL dnl DEFS SIGACTION_NEED_REINSTALL
CL_SIGACTION_UNBLOCK dnl DEFS SIGACTION_NEED_UNBLOCK
! CL_SIGINTERRUPT dnl DEFS HAVE_SIGINTERRUPT
CL_PERROR dnl DEFS HAVE_PERROR_DECL
AC_CHECK_FUNCS(strerror sysconf getdtablesize memset setsid setpgid fchmod dnl
fsync flock gethostent shutdown usleep ualarm setitimer nice ftime realpath dnl
diff -c -3 -r1.92 unix.d
*** src/unix.d 31 May 2008 19:56:49 -0000 1.92
--- src/unix.d 31 May 2008 20:21:40 -0000
***************
*** 272,278 ****
#ifdef EINTR
extern_C int siginterrupt (int sig, int flag); /* SIGINTERRUPT(3V) */
#ifndef HAVE_SIGINTERRUPT
! /* siginterrupt() can be implemented with sigaction() or sigvec() */
#define NEED_OWN_SIGINTERRUPT
#endif
#else
--- 272,278 ----
#ifdef EINTR
extern_C int siginterrupt (int sig, int flag); /* SIGINTERRUPT(3V) */
#ifndef HAVE_SIGINTERRUPT
! /* siginterrupt() can be implemented with sigaction() */
#define NEED_OWN_SIGINTERRUPT
#endif
#else
diff -c -3 -r1.59 unixaux.d
*** src/unixaux.d 17 Dec 2007 15:56:19 -0000 1.59
--- src/unixaux.d 31 May 2008 20:21:40 -0000
***************
*** 1,6 ****
/*
* Auxiliary functions for CLISP on UNIX
! * Bruno Haible 1990-2004
* Sam Steingold 1998-2005
*/
--- 1,6 ----
/*
* Auxiliary functions for CLISP on UNIX
! * Bruno Haible 1990-2008
* Sam Steingold 1998-2005
*/
***************
*** 168,175 ****
global int siginterrupt (int sig, int flag);
#if defined(HAVE_SIGACTION)
extern_C int sigaction (/* int sig, [const] struct sigaction * new, struct sigaction * old */);
- #elif defined(HAVE_SIGVEC) && defined(SV_INTERRUPT)
- extern_C int sigvec (/* int sig, [const] struct sigvec * new, struct sigvec * old */);
#endif
global int siginterrupt (int sig, int flag) {
#if defined(HAVE_SIGACTION)
--- 168,173 ----
***************
*** 198,216 ****
}
#endif
sigaction(sig,&sa,(struct sigaction *)NULL);
- #elif defined(HAVE_SIGVEC) && defined(SV_INTERRUPT)
- var struct sigvec sv;
- sigvec(sig,(struct sigvec *)NULL,&sv);
- if (flag) {
- if (sv.sv_flags & SV_INTERRUPT)
- return 0;
- sv.sv_flags |= SV_INTERRUPT; /* system calls will be interrupted */
- } else {
- if (!(sv.sv_flags & SV_INTERRUPT))
- return 0;
- sv.sv_flags &= ~ SV_INTERRUPT; /* system calls will be restarted */
- }
- sigvec(sig,&sv,(struct sigvec *)NULL);
#endif
return 0; /* the return value is always ignored. */
}
--- 196,201 ----
diff -c -3 -r1.3 siginterrupt.m4
*** src/m4/siginterrupt.m4 30 May 2008 14:39:08 -0000 1.3
--- src/m4/siginterrupt.m4 31 May 2008 20:21:40 -0000
***************
*** 1,5 ****
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
--- 1,5 ----
dnl -*- Autoconf -*-
! dnl Copyright (C) 1993-2008 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
***************
*** 13,19 ****
AC_DEFUN([CL_SIGINTERRUPT],
[AC_REQUIRE([CL_SIGACTION])dnl
AC_CHECK_FUNCS(siginterrupt)dnl
- if test "$ac_cv_func_siginterrupt" = yes -a "$ac_cv_func_sigaction" = yes; then
- AC_CHECK_FUNCS(sigvec)dnl
- fi
])
--- 13,16 ----
|
|
From: Bruno H. <br...@cl...> - 2008-05-31 20:28:58
|
RL_RETSIGTYPE is not needed any more. (As the name implies, it was used for readline.) 2008-05-31 Bruno Haible <br...@cl...> * m4/signal.m4 (RL_RETSIGTYPE): Remove macro. diff -c -3 -r1.6 signal.m4 *** src/m4/signal.m4 25 May 2008 09:11:40 -0000 1.6 --- src/m4/signal.m4 31 May 2008 20:27:13 -0000 *************** *** 10,38 **** AC_PREREQ(2.57) - AC_DEFUN([RL_RETSIGTYPE], - [AC_MSG_CHECKING(return type of signal handlers) - CL_PROTO_RET( - [#include <sys/types.h> - #include <signal.h> - #ifdef signal - #undef signal - #endif - ], [ - #ifdef __cplusplus - int (*signal (int sig, void (*handler)(int))) (); - #else - int (*signal ()) (); - #endif - ], [int (*signal ()) ();], - cl_cv_proto_signal_ret, int, void) - AC_MSG_RESULT($cl_cv_proto_signal_ret) - AC_DEFINE_UNQUOTED(RETSIGTYPE,$cl_cv_proto_signal_ret,[return type of signal handlers (int or void)]) - if test $cl_cv_proto_signal_ret = void; then - AC_DEFINE_UNQUOTED(RETSIGTYPE_VOID,,[return type of signal handlers is void]) - fi - ]) - AC_DEFUN([CL_TYPE_SIGNAL], [AC_CACHE_CHECK([return type of signal handlers], cl_cv_type_signal, [AC_TRY_COMPILE([#include <sys/types.h> --- 10,15 ---- |
Thanks for helping keep SourceForge clean.
X