You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

392 lines
11 KiB

Index: args.c
--- args.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ args.c 2019-07-11 09:36:06.893604000 +0200
@@ -29,8 +29,8 @@
#include <signal.h>
#include <string.h>
#include <stdarg.h>
+#include <stdlib.h>
#include "config.h"
-#include "alloca.h"
#include "lib.h"
#include "signal.h"
#include "unwind.h"
Index: arith.c
--- arith.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ arith.c 2019-07-11 09:36:06.894474000 +0200
@@ -40,7 +40,6 @@
#if HAVE_ROUNDING_CTL_H
#include <fenv.h>
#endif
-#include "alloca.h"
#include "lib.h"
#include "signal.h"
#include "unwind.h"
Index: combi.c
--- combi.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ combi.c 2019-07-11 09:36:06.894747000 +0200
@@ -25,6 +25,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <stdlib.h>
#include <wctype.h>
#include <wchar.h>
#include <signal.h>
Index: configure
--- configure.orig 2019-07-09 08:30:20.000000000 +0200
+++ configure 2019-07-11 09:36:06.895374000 +0200
@@ -907,6 +907,7 @@
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
+#include <stdlib.h>
#include <wchar.h>
#include <wctype.h>
@@ -1080,13 +1081,6 @@
broken128=
output=$($make conftest.ccver)
set -- $output
-if [ "$1" = "gcc" ] ; then
- gcc_version=$3
- save_ifs=$IFS ; IFS=. ; set -- $gcc_version ; IFS=$save_ifs
- if [ $1 -lt 4 ] || [ $1 -eq 4 -a $2 -le 3 ] ; then
- broken128=y
- fi
-fi
superlong=
@@ -2242,6 +2236,7 @@
cat > conftest.c <<!
#include "config.h"
#include <process.h>
+#include <stdlib.h>
#include <wchar.h>
int main(int argc, char **argv)
Index: eval.c
--- eval.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ eval.c 2019-07-11 09:36:06.896605000 +0200
@@ -34,7 +34,6 @@
#include <time.h>
#include <assert.h>
#include "config.h"
-#include "alloca.h"
#include "lib.h"
#include "gc.h"
#include "args.h"
Index: ffi.c
--- ffi.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ ffi.c 2019-07-11 09:36:06.897595000 +0200
@@ -43,7 +43,6 @@
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#include "alloca.h"
#include "lib.h"
#include "stream.h"
#include "gc.h"
Index: ftw.c
--- ftw.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ ftw.c 2019-07-11 09:36:06.897809000 +0200
@@ -32,7 +32,6 @@
#include <stddef.h>
#include <ftw.h>
#include "config.h"
-#include "alloca.h"
#include "lib.h"
#include "gc.h"
#include "args.h"
Index: hash.c
--- hash.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ hash.c 2019-07-11 09:36:06.898206000 +0200
@@ -32,7 +32,6 @@
#include <limits.h>
#include <signal.h>
#include "config.h"
-#include "alloca.h"
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
Index: lib.c
--- lib.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ lib.c 2019-07-11 09:36:06.900010000 +0200
@@ -40,7 +40,6 @@
#include <sys/time.h>
#include <assert.h>
#include "config.h"
-#include "alloca.h"
#ifdef HAVE_GETENVIRONMENTSTRINGS
#define NOMINMAX
#include <windows.h>
Index: match.c
--- match.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ match.c 2019-07-11 09:36:06.900894000 +0200
@@ -32,7 +32,6 @@
#include <wchar.h>
#include <signal.h>
#include "config.h"
-#include "alloca.h"
#include "lib.h"
#include "gc.h"
#include "args.h"
Index: parser.c
--- parser.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ parser.c 2019-07-11 09:36:06.901287000 +0200
@@ -37,7 +37,6 @@
#include <wctype.h>
#include <errno.h>
#include "config.h"
-#include "alloca.h"
#ifdef __CYGWIN__
#include <sys/utsname.h>
#endif
Index: parser.y
--- parser.y.orig 2019-07-09 08:30:20.000000000 +0200
+++ parser.y 2019-07-11 09:36:06.901755000 +0200
@@ -37,8 +37,8 @@
#include <setjmp.h>
#include <wchar.h>
#include <signal.h>
+#include <string.h>
#include "config.h"
-#include "alloca.h"
#include "lib.h"
#include "signal.h"
#include "unwind.h"
Index: regex.c
--- regex.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ regex.c 2019-07-11 09:36:06.902372000 +0200
@@ -34,7 +34,6 @@
#include <signal.h>
#include <stdarg.h>
#include "config.h"
-#include "alloca.h"
#include "lib.h"
#include "parser.h"
#include "signal.h"
Index: socket.c
--- socket.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ socket.c 2019-07-11 09:36:06.902707000 +0200
@@ -35,10 +35,12 @@
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
#include <sys/un.h>
#include <netdb.h>
#include "config.h"
-#include "alloca.h"
#if HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
Index: stream.c
--- stream.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ stream.c 2019-07-11 09:36:06.903529000 +0200
@@ -35,8 +35,13 @@
#include <ctype.h>
#include <wchar.h>
#include <wctype.h>
+#include <sys/types.h>
#include <signal.h>
#include "config.h"
+#ifdef __FreeBSD__
+#undef __XSI_VISIBLE
+#define __XSI_VISIBLE 1
+#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -56,7 +61,6 @@
#if HAVE_SOCKETS
#include <sys/socket.h>
#endif
-#include "alloca.h"
#include "lib.h"
#include "gc.h"
#include "signal.h"
Index: struct.c
--- struct.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ struct.c 2019-07-11 09:36:06.903937000 +0200
@@ -34,7 +34,6 @@
#include <signal.h>
#include <assert.h>
#include "config.h"
-#include "alloca.h"
#include "lib.h"
#include "hash.h"
#include "eval.h"
Index: sysif.c
--- sysif.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ sysif.c 2019-07-11 09:38:57.531069000 +0200
@@ -28,6 +28,7 @@
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <string.h>
#include <wchar.h>
#include <signal.h>
@@ -76,7 +77,6 @@
#if HAVE_DLOPEN
#include <dlfcn.h>
#endif
-#include "alloca.h"
#include "lib.h"
#include "stream.h"
#include "hash.h"
@@ -1808,18 +1808,26 @@
reg_varl(intern(lit("enetunreach"), user_package), num_fast(ENETUNREACH));
reg_varl(intern(lit("enfile"), user_package), num_fast(ENFILE));
reg_varl(intern(lit("enobufs"), user_package), num_fast(ENOBUFS));
+#ifdef ENODATA
reg_varl(intern(lit("enodata"), user_package), num_fast(ENODATA));
+#endif
reg_varl(intern(lit("enodev"), user_package), num_fast(ENODEV));
reg_varl(intern(lit("enoent"), user_package), num_fast(ENOENT));
reg_varl(intern(lit("enoexec"), user_package), num_fast(ENOEXEC));
reg_varl(intern(lit("enolck"), user_package), num_fast(ENOLCK));
reg_varl(intern(lit("enolink"), user_package), num_fast(ENOLINK));
reg_varl(intern(lit("enomem"), user_package), num_fast(ENOMEM));
+#ifdef ENOMSG
reg_varl(intern(lit("enomsg"), user_package), num_fast(ENOMSG));
+#endif
reg_varl(intern(lit("enoprotoopt"), user_package), num_fast(ENOPROTOOPT));
reg_varl(intern(lit("enospc"), user_package), num_fast(ENOSPC));
+#ifdef ENOSR
reg_varl(intern(lit("enosr"), user_package), num_fast(ENOSR));
+#endif
+#ifdef ENOSTR
reg_varl(intern(lit("enostr"), user_package), num_fast(ENOSTR));
+#endif
reg_varl(intern(lit("enosys"), user_package), num_fast(ENOSYS));
reg_varl(intern(lit("enotconn"), user_package), num_fast(ENOTCONN));
reg_varl(intern(lit("enotdir"), user_package), num_fast(ENOTDIR));
@@ -1829,7 +1837,9 @@
#endif
reg_varl(intern(lit("enotsock"), user_package), num_fast(ENOTSOCK));
reg_varl(intern(lit("enotsup"), user_package), num_fast(ENOTSUP));
+#ifdef ENOTTY
reg_varl(intern(lit("enotty"), user_package), num_fast(ENOTTY));
+#endif
reg_varl(intern(lit("enxio"), user_package), num_fast(ENXIO));
reg_varl(intern(lit("eopnotsupp"), user_package), num_fast(EOPNOTSUPP));
reg_varl(intern(lit("eoverflow"), user_package), num_fast(EOVERFLOW));
@@ -1846,7 +1856,9 @@
reg_varl(intern(lit("espipe"), user_package), num_fast(ESPIPE));
reg_varl(intern(lit("esrch"), user_package), num_fast(ESRCH));
reg_varl(intern(lit("estale"), user_package), num_fast(ESTALE));
+#ifdef ETIME
reg_varl(intern(lit("etime"), user_package), num_fast(ETIME));
+#endif
reg_varl(intern(lit("etimedout"), user_package), num_fast(ETIMEDOUT));
reg_varl(intern(lit("etxtbsy"), user_package), num_fast(ETXTBSY));
reg_varl(intern(lit("ewouldblock"), user_package), num_fast(EWOULDBLOCK));
Index: syslog.c
--- syslog.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ syslog.c 2019-07-11 09:36:06.904650000 +0200
@@ -33,7 +33,6 @@
#include <signal.h>
#include <syslog.h>
#include "config.h"
-#include "alloca.h"
#include "lib.h"
#include "stream.h"
#include "gc.h"
Index: termios.c
--- termios.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ termios.c 2019-07-11 09:36:06.904930000 +0200
@@ -35,7 +35,6 @@
#include <errno.h>
#include <termios.h>
#include "config.h"
-#include "alloca.h"
#include "lib.h"
#include "gc.h"
#include "args.h"
@@ -451,13 +450,21 @@
reg_varl(intern(lit("ocrnl"), user_package), num_fast(OCRNL));
reg_varl(intern(lit("onocr"), user_package), num_fast(ONOCR));
reg_varl(intern(lit("onlret"), user_package), num_fast(ONLRET));
+#ifdef OFILL
reg_varl(intern(lit("ofill"), user_package), num_fast(OFILL));
+#endif
#ifdef OFDEL
reg_varl(intern(lit("ofdel"), user_package), num_fast(OFDEL));
#endif
+#ifdef VTDLY
reg_varl(intern(lit("vtdly"), user_package), num_fast(VTDLY));
+#endif
+#ifdef VT0
reg_varl(intern(lit("vt0"), user_package), num_fast(VT0));
+#endif
+#ifdef VT1
reg_varl(intern(lit("vt1"), user_package), num_fast(VT1));
+#endif
#ifdef NLDLY
reg_varl(intern(lit("nldly"), user_package), num_fast(NLDLY));
reg_varl(intern(lit("nl0"), user_package), num_fast(NL0));
@@ -473,10 +480,16 @@
#ifdef TABDLY
reg_varl(intern(lit("tabdly"), user_package), num_fast(TABDLY));
reg_varl(intern(lit("tab0"), user_package), num_fast(TAB0));
+#ifdef TAB1
reg_varl(intern(lit("tab1"), user_package), num_fast(TAB1));
+#endif
+#ifdef TAB2
reg_varl(intern(lit("tab2"), user_package), num_fast(TAB2));
+#endif
+#ifdef TAB3
reg_varl(intern(lit("tab3"), user_package), num_fast(TAB3));
#endif
+#endif
#ifdef BSDLY
reg_varl(intern(lit("bsdly"), user_package), num_fast(BSDLY));
reg_varl(intern(lit("bs0"), user_package), num_fast(BS0));
Index: txr.c
--- txr.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ txr.c 2019-07-11 09:36:06.905273000 +0200
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include <limits.h>
#include <stdarg.h>
+#include <stdlib.h>
#include <wchar.h>
#include <signal.h>
#include "config.h"
@@ -259,6 +260,9 @@
#else
static val get_self_path(void)
{
+ char *p = getenv("TXR_INST_PATH");
+ if (p != NULL)
+ return string_utf8(p);
return lit(TXR_INST_PATH);
}
#endif
Index: unwind.c
--- unwind.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ unwind.c 2019-07-11 09:36:06.905613000 +0200
@@ -45,7 +45,6 @@
#include "eval.h"
#include "struct.h"
#include "cadr.h"
-#include "alloca.h"
#include "arith.h"
#include "unwind.h"
#include "debug.h"
Index: vm.c
--- vm.c.orig 2019-07-09 08:30:20.000000000 +0200
+++ vm.c 2019-07-11 09:36:06.905971000 +0200
@@ -34,7 +34,6 @@
#include <signal.h>
#include <assert.h>
#include "config.h"
-#include "alloca.h"
#include "lib.h"
#include "eval.h"
#include "signal.h"