2015-06-15  Juan Manuel Guerrero  <juan.guerrero@gmx.de>

	* config.guess: Adjusted so that i?86 is also recognized.

	* lib/long-options.c: Include stdlib.h.

	* lib/memcoll.c [__DJGPP__]: Add alloca prototype.

	* lib/obstack.c: Include stdlib.h.






diff -aprNU5 gnu.orig/txtutil2.0/config.guess gnu/txtutil2.0/config.guess
--- gnu.orig/txtutil2.0/config.guess	1999-08-05 15:55:16 +0000
+++ gnu/txtutil2.0/config.guess	2015-06-15 22:03:08 +0000
@@ -828,11 +828,15 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    i?86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     pc:*:*:*)
+	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
         exit 0 ;;
     Intel:Mach:3*:*)
diff -aprNU5 gnu.orig/txtutil2.0/lib/long-options.c gnu/txtutil2.0/lib/long-options.c
--- gnu.orig/txtutil2.0/lib/long-options.c	1999-03-26 23:47:36 +0000
+++ gnu/txtutil2.0/lib/long-options.c	2015-06-16 19:05:32 +0000
@@ -20,10 +20,11 @@
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <getopt.h>
 #include "closeout.h"
 #include "long-options.h"
 #include "version-etc.h"
 
diff -aprNU5 gnu.orig/txtutil2.0/lib/memcoll.c gnu/txtutil2.0/lib/memcoll.c
--- gnu.orig/txtutil2.0/lib/memcoll.c	1999-07-04 13:32:34 +0000
+++ gnu/txtutil2.0/lib/memcoll.c	2015-06-16 19:05:30 +0000
@@ -33,10 +33,13 @@
 #    include <io.h>
 #   else
 #    ifndef alloca
 char *alloca ();
 #    endif
+#    ifdef __DJGPP__
+void *alloca (size_t size);
+#    endif
 #   endif
 #  endif
 # endif
 #endif
 
diff -aprNU5 gnu.orig/txtutil2.0/lib/obstack.c gnu/txtutil2.0/lib/obstack.c
--- gnu.orig/txtutil2.0/lib/obstack.c	1997-08-22 17:55:44 +0000
+++ gnu/txtutil2.0/lib/obstack.c	2015-06-16 19:05:30 +0000
@@ -41,10 +41,12 @@
 #if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
 #define ELIDE_CODE
 #endif
 #endif
 
+#include <stdlib.h>
+
 
 #ifndef ELIDE_CODE
 
 
 #if defined (__STDC__) && __STDC__
