diff -NrU5 fish-1.23.0.orig/exec.c fish-1.23.0/exec.c
--- fish-1.23.0.orig/exec.c	2008-06-16 00:16:10.000000000 +0200
+++ fish-1.23.0/exec.c	2008-06-16 00:21:02.000000000 +0200
@@ -11,10 +11,18 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <termios.h>
 #include <unistd.h>
+
+#if defined(_SC_ARG_MAX) 
+# if defined(ARG_MAX) 
+#    undef ARG_MAX 
+# endif 
+# define ARG_MAX sysconf (_SC_ARG_MAX) 
+#endif 
+
 #include <fcntl.h>
 #include <errno.h>
 #include <wchar.h>
 #include <string.h>
 #include <limits.h>