diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-02-19 18:41:02 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-02-19 18:41:02 +0000 |
| commit | 7e8519d4009328b4ea1ed3736f9ef3a2d265a3ce (patch) | |
| tree | 466b759bfd2a467a5ae5711bc88de012d4e37002 | |
| parent | d5a7308fdca3f00c9e9825e1171e9b6fe6ec2273 (diff) | |
| download | open-axiom-7e8519d4009328b4ea1ed3736f9ef3a2d265a3ce.tar.gz | |
2009-02-19 Aleksej Saushev <asau@inbox.ru>
* configure.ac.pamphlet: Fix indention of CPP directives. Include
<sys/types.h> when testing for openpty.
src/ChangeLog
2009-02-19 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/sys-utility.boot (%hostByteOrder): Make a function.
* algebra/system.spad.pamphlet (hostByteOrder$System): Adjust call.
2009-02-19 Aleksej Saushev <asau@inbox.ru>
* lib/openpty.c: Include <sys/types.h> when testing for openpty.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 61 | ||||
| -rw-r--r-- | configure.ac | 75 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 75 | ||||
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/algebra/system.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/interp/i-syscmd.boot | 12 | ||||
| -rw-r--r-- | src/interp/sys-utility.boot | 2 | ||||
| -rw-r--r-- | src/lib/openpty.c | 1 |
9 files changed, 132 insertions, 110 deletions
@@ -1,3 +1,8 @@ +2009-02-19 Aleksej Saushev <asau@inbox.ru> + + * configure.ac.pamphlet: Fix indention of CPP directives. Include + <sys/types.h> when testing for openpty. + 2009-02-09 Gabriel Dos Reis <gdr@cs.tamu.edu> * configure.ac.pamphlet: Check for <sys/ioctl.h>, <termios.h>, and @@ -23445,14 +23445,14 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <#if HAVE_SYS_SOCKET_H - # include <sys/socket.h> - #else - # include <winsock2.h> - #endif - #ifdef AF_LOCAL - has_af_local - #endif> +#if HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#else +# include <winsock2.h> +#endif +#ifdef AF_LOCAL + has_af_local +#endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -23473,14 +23473,14 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <#if HAVE_SYS_SOCKET_H - # include <sys/socket.h> - #else - # include <winsock2.h> - #endif - #ifdef AF_UNIX - has_af_unix - #endif> +#if HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#else +# include <winsock2.h> +#endif +#ifdef AF_UNIX + has_af_unix +#endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -24028,20 +24028,21 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #if HAVE_PTY_H - # include <pty.h> - #endif - #if HAVE_UTIL_H - # include <util.h> - #endif - #if HAVE_SYS_IOCTL_H - # include <sys/ioctl.h> - #endif - #if HAVE_TERMIOS_H - # include <termios.h> - #endif - #if HAVE_LIBTUIL_H - # include <libutil.h> - #endif +# include <pty.h> +#endif +#if HAVE_UTIL_H +# include <util.h> +#endif +#if HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif +#if HAVE_TERMIOS_H +# include <termios.h> +#endif +#if HAVE_LIBTUIL_H +# include <sys/types.h> +# include <libutil.h> +#endif int diff --git a/configure.ac b/configure.ac index 9d805fdd..24306cf6 100644 --- a/configure.ac +++ b/configure.ac @@ -421,28 +421,30 @@ esac AC_SUBST(axiom_c_runtime_extra) -AC_EGREP_HEADER([has_af_local], - [#if HAVE_SYS_SOCKET_H - # include <sys/socket.h> - #else - # include <winsock2.h> - #endif - #ifdef AF_LOCAL - has_af_local - #endif], - [AC_DEFINE([HAVE_AF_LOCAL], [1], [Host has AF_LOCAL])]) - - -AC_EGREP_HEADER([has_af_unix], - [#if HAVE_SYS_SOCKET_H - # include <sys/socket.h> - #else - # include <winsock2.h> - #endif - #ifdef AF_UNIX - has_af_unix - #endif], - [AC_DEFINE([HAVE_AF_UNIX], [1], [Host has AF_UNIX])]) +AC_EGREP_CPP([has_af_local], + [#if HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#else +# include <winsock2.h> +#endif +#ifdef AF_LOCAL + has_af_local +#endif + ], + [AC_DEFINE([HAVE_AF_LOCAL], [1], [Host has AF_LOCAL])]) + + +AC_EGREP_CPP([has_af_unix], + [#if HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#else +# include <winsock2.h> +#endif +#ifdef AF_UNIX + has_af_unix +#endif + ], + [AC_DEFINE([HAVE_AF_UNIX], [1], [Host has AF_UNIX])]) AC_CHECK_HEADERS([sys/wait.h]) @@ -462,20 +464,21 @@ AC_CHECK_DECLS([fork], AC_CHECK_HEADERS([sys/ioctl.h pty.h util.h libutil.h termios.h]) AC_CHECK_DECLS([openpty],[],[], [#if HAVE_PTY_H - # include <pty.h> - #endif - #if HAVE_UTIL_H - # include <util.h> - #endif - #if HAVE_SYS_IOCTL_H - # include <sys/ioctl.h> - #endif - #if HAVE_TERMIOS_H - # include <termios.h> - #endif - #if HAVE_LIBTUIL_H - # include <libutil.h> - #endif +# include <pty.h> +#endif +#if HAVE_UTIL_H +# include <util.h> +#endif +#if HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif +#if HAVE_TERMIOS_H +# include <termios.h> +#endif +#if HAVE_LIBTUIL_H +# include <sys/types.h> +# include <libutil.h> +#endif ]) if test x"$ac_cv_have_decl_openpty" = xyes; then \ AC_SEARCH_LIBS([openpty],[util]) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index bd2234ff..e1c94493 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -285,28 +285,30 @@ esac AC_SUBST(axiom_c_runtime_extra) -AC_EGREP_HEADER([has_af_local], - [#if HAVE_SYS_SOCKET_H - # include <sys/socket.h> - #else - # include <winsock2.h> - #endif - #ifdef AF_LOCAL - has_af_local - #endif], - [AC_DEFINE([HAVE_AF_LOCAL], [1], [Host has AF_LOCAL])]) - - -AC_EGREP_HEADER([has_af_unix], - [#if HAVE_SYS_SOCKET_H - # include <sys/socket.h> - #else - # include <winsock2.h> - #endif - #ifdef AF_UNIX - has_af_unix - #endif], - [AC_DEFINE([HAVE_AF_UNIX], [1], [Host has AF_UNIX])]) +AC_EGREP_CPP([has_af_local], + [#if HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#else +# include <winsock2.h> +#endif +#ifdef AF_LOCAL + has_af_local +#endif + ], + [AC_DEFINE([HAVE_AF_LOCAL], [1], [Host has AF_LOCAL])]) + + +AC_EGREP_CPP([has_af_unix], + [#if HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#else +# include <winsock2.h> +#endif +#ifdef AF_UNIX + has_af_unix +#endif + ], + [AC_DEFINE([HAVE_AF_UNIX], [1], [Host has AF_UNIX])]) @ @@ -332,20 +334,21 @@ AC_CHECK_DECLS([fork], AC_CHECK_HEADERS([sys/ioctl.h pty.h util.h libutil.h termios.h]) AC_CHECK_DECLS([openpty],[],[], [#if HAVE_PTY_H - # include <pty.h> - #endif - #if HAVE_UTIL_H - # include <util.h> - #endif - #if HAVE_SYS_IOCTL_H - # include <sys/ioctl.h> - #endif - #if HAVE_TERMIOS_H - # include <termios.h> - #endif - #if HAVE_LIBTUIL_H - # include <libutil.h> - #endif +# include <pty.h> +#endif +#if HAVE_UTIL_H +# include <util.h> +#endif +#if HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif +#if HAVE_TERMIOS_H +# include <termios.h> +#endif +#if HAVE_LIBTUIL_H +# include <sys/types.h> +# include <libutil.h> +#endif ]) if test x"$ac_cv_have_decl_openpty" = xyes; then \ AC_SEARCH_LIBS([openpty],[util]) diff --git a/src/ChangeLog b/src/ChangeLog index 4bb8e6e5..01aabf89 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,14 @@ 2009-02-19 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/sys-utility.boot (%hostByteOrder): Make a function. + * algebra/system.spad.pamphlet (hostByteOrder$System): Adjust call. + +2009-02-19 Aleksej Saushev <asau@inbox.ru> + + * lib/openpty.c: Include <sys/types.h> when testing for openpty. + +2009-02-19 Gabriel Dos Reis <gdr@cs.tamu.edu> + * algebra/catdef.spad.pamphlet (characteristic$Ring): Make a constant. * algebra/naalgc.spad.pamphlet diff --git a/src/algebra/system.spad.pamphlet b/src/algebra/system.spad.pamphlet index 70b31162..ae4d6351 100644 --- a/src/algebra/system.spad.pamphlet +++ b/src/algebra/system.spad.pamphlet @@ -46,7 +46,7 @@ System(): Public == Private where hostPlatform == _$hostPlatform$Lisp - hostByteOrder == %hostByteOrder$Lisp + hostByteOrder == %hostByteOrder()$Lisp nativeModuleExtension == _$NativeModuleExt$Lisp diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot index ec6a4d2e..e43562eb 100644 --- a/src/interp/i-syscmd.boot +++ b/src/interp/i-syscmd.boot @@ -972,12 +972,12 @@ CREDITS := '( "Norman Ramsey Michael Richardson Renaud Rioboo" "Jean Rivlin Nicolas Robidoux Simon Robinson" "Michael Rothstein Martin Rubey" - "Philip Santas Alfred Scheerhorn William Schelter" - "Gerhard Schneider Martin Schoenert Marshall Schor" - "Frithjof Schulze Fritz Schwarz Nick Simicich" - "William Sit Elena Smirnova Jonathan Steinbach" - "Christine Sundaresan Robert Sutor Moss E. Sweedler" - "Eugene Surowitz" + "Aleksej Saushev Philip Santas Alfred Scheerhorn" + "William Schelter Gerhard Schneider Martin Schoenert" + "Marshall Schor Frithjof Schulze Fritz Schwarz" + "Nick Simicich William Sit Elena Smirnova" + "Jonathan Steinbach Christine Sundaresan Robert Sutor" + "Moss E. Sweedler Eugene Surowitz" "James Thatcher Balbir Thomas Mike Thomas" "Dylan Thurston Barry Trager Themos T. Tsikas" "Gregory Vanuxem" diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot index ad353d3b..5192ded1 100644 --- a/src/interp/sys-utility.boot +++ b/src/interp/sys-utility.boot @@ -53,7 +53,7 @@ $COMBLOCKLIST := nil %unknownEndian == KEYWORD::%unknownEndian ++ The byte order of the host machine running OpenAxiom. -%hostByteOrder == +%hostByteOrder() == getHostByteOrder() = 1 => %littleEndian getHostByteOrder() = 2 => %bigEndian %unknownEndian diff --git a/src/lib/openpty.c b/src/lib/openpty.c index 5cf36c34..920f8ab1 100644 --- a/src/lib/openpty.c +++ b/src/lib/openpty.c @@ -51,6 +51,7 @@ # include <termios.h> #endif #ifdef HAVE_LIBUTIL_H +# include <sys/types.h> # include <libutil.h> #endif |