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.
 
 
 
 
 
 

260 lines
6.5 KiB

Index: combi.c
--- combi.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ combi.c 2016-05-21 09:35:33.121506537 +0200
@@ -24,6 +24,7 @@
* 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 2016-05-20 15:10:51.000000000 +0200
+++ configure 2016-05-21 09:35:33.121506537 +0200
@@ -840,6 +840,7 @@
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
+#include <stdlib.h>
#include <wchar.h>
#include <wctype.h>
@@ -1017,13 +1018,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=
@@ -2022,6 +2016,7 @@
cat > conftest.c <<!
#include "config.h"
#include <process.h>
+#include <stdlib.h>
#include <wchar.h>
int main(int argc, char **argv)
@@ -2378,7 +2373,7 @@
printf "Checking for alloca ... "
-for try_header in alloca.h malloc.h ; do
+for try_header in stdlib.h alloca.h malloc.h ; do
cat > conftest.c <<!
#include <$try_header>
Index: eval.c
--- eval.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ eval.c 2016-05-21 09:35:33.121506537 +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: hash.c
--- hash.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ hash.c 2016-05-21 09:35:33.121506537 +0200
@@ -32,7 +32,6 @@
#include <limits.h>
#include <signal.h>
#include "config.h"
-#include ALLOCA_H
#include "lib.h"
#include "gc.h"
#include "args.h"
Index: lib.c
--- lib.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ lib.c 2016-05-21 09:35:33.121506537 +0200
@@ -37,10 +37,12 @@
#include <math.h>
#include <time.h>
#include <signal.h>
+#ifdef __FreeBSD__
+#define __XSI_VISIBLE 1
+#endif
#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 2016-05-20 15:10:51.000000000 +0200
+++ match.c 2016-05-21 09:35:33.121506537 +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.y
--- parser.y.orig 2016-05-20 15:10:51.000000000 +0200
+++ parser.y 2016-05-21 09:35:33.121506537 +0200
@@ -36,8 +36,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: signal.c
--- signal.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ signal.c 2016-05-21 09:35:33.121506537 +0200
@@ -29,6 +29,9 @@
#include <stdarg.h>
#include <errno.h>
#include <wchar.h>
+#ifdef __FreeBSD__
+#define __XSI_VISIBLE 1
+#endif
#include <signal.h>
#include "config.h"
#if HAVE_SYS_TIME
Index: socket.c
--- socket.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ socket.c 2016-05-21 09:38:01.701586547 +0200
@@ -35,6 +35,9 @@
#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"
Index: stream.c
--- stream.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ stream.c 2016-05-21 09:35:33.121506537 +0200
@@ -34,8 +34,12 @@
#include <ctype.h>
#include <wchar.h>
#include <wctype.h>
+#include <sys/types.h>
#include <signal.h>
#include "config.h"
+#ifdef __FreeBSD__
+#define __XSI_VISIBLE 1
+#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -52,7 +56,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 2016-05-20 15:10:51.000000000 +0200
+++ struct.c 2016-05-21 09:35:33.131493560 +0200
@@ -33,7 +33,6 @@
#include <limits.h>
#include <signal.h>
#include "config.h"
-#include ALLOCA_H
#include "lib.h"
#include "hash.h"
#include "eval.h"
Index: sysif.c
--- sysif.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ sysif.c 2016-05-21 09:35:33.131493560 +0200
@@ -27,6 +27,7 @@
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <string.h>
#include <wchar.h>
#include <signal.h>
@@ -67,7 +68,6 @@
#endif
#include <fnmatch.h>
#endif
-#include ALLOCA_H
#include "lib.h"
#include "stream.h"
#include "hash.h"
Index: syslog.c
--- syslog.c.orig 2016-05-20 15:10:51.000000000 +0200
+++ syslog.c 2016-05-21 09:35:33.131493560 +0200
@@ -33,7 +33,6 @@
#include <dirent.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 2016-05-20 15:10:51.000000000 +0200
+++ termios.c 2016-05-21 09:39:41.462010288 +0200
@@ -451,13 +451,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 +481,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 2016-05-20 15:10:51.000000000 +0200
+++ txr.c 2016-05-21 09:35:33.131493560 +0200
@@ -29,6 +29,7 @@
#include <limits.h>
#include <dirent.h>
#include <stdarg.h>
+#include <stdlib.h>
#include <wchar.h>
#include <signal.h>
#include "config.h"