Revert more patches applied to contrib/tools/m4

commit_hash:fb87ade017a656215b6a71fc4504fb2c07c3b370

Author: georgthegreat

contrib/tools/m4/lib/c-stack.c

@@ -52,10 +52,6 @@ typedef struct sigaltstack stack_t;
 #endif
 #ifndef SIGSTKSZ
 # define SIGSTKSZ 16384
-#elif defined __USE_DYNAMIC_STACK_SIZE
-/* Redefining SIGSTKSZ here as dynamic stack size is not supported in this version of bison */
-# undef SIGSTKSZ
-# define SIGSTKSZ 16384
 #elif HAVE_LIBSIGSEGV && SIGSTKSZ < 16384
 /* libsigsegv 2.6 through 2.8 have a bug where some architectures use
    more than the Linux default of an 8k alternate stack when deciding
@@ -76,7 +72,7 @@ typedef struct sigaltstack stack_t;
 #include <unistd.h>
 
 #if HAVE_LIBSIGSEGV
-# include <sigsegv.h>
+# error #include <sigsegv.h>
 #endif
 
 #include "c-stack.h"
@@ -327,10 +323,7 @@ c_stack_action (void (*action) (int))
 int
 c_stack_action (void (*action) (int)  __attribute__ ((unused)))
 {
-#if (defined _MSC_VER) && (_MSC_VER < 1800)
-#else
   errno = ENOTSUP;
-#endif
   return -1;
 }
 

contrib/tools/m4/lib/sigsegv.h

@@ -54,7 +54,7 @@
 # include <config.h>
 #endif
 #ifndef IN_LIBINTL
-# include "palloca.h"
+# include <alloca.h>
 #endif
 
 /* Specification.  */
@@ -5575,10 +5575,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
     if (buf_malloced != NULL)
       free (buf_malloced);
     CLEANUP ();
-#if (defined _MSC_VER) && (_MSC_VER < 1800)
-#else
     errno = EOVERFLOW;
-#endif
     return NULL;
 #endif
 

contrib/tools/m4/lib/vasnprintf.c

@@ -40,10 +40,7 @@ vasprintf (char **resultp, const char *format, va_list args)
   if (length > INT_MAX)
     {
       free (result);
-#if (defined _MSC_VER) && (_MSC_VER < 1800)
-#else
       errno = EOVERFLOW;
-#endif
       return -1;
     }
 

contrib/tools/m4/lib/vasprintf.c

@@ -21,25 +21,8 @@
 #include "xstrndup.h"
 
 #include <string.h>
-#include <stdlib.h>
-
 #include "xalloc.h"
 
-#if defined(_MSC_VER)
-static char *
-strndup(char const *s, size_t n)
-{
-	size_t len = strnlen(s, n);
-	char *new = malloc(len + 1);
-
-	if (new == NULL)
-		return NULL;
-
-	new[len] = '\0';
-	return memcpy(new, s, len);
-}
-#endif
-
 /* Return a newly allocated copy of at most N bytes of STRING.
    In other words, return a copy of the initial segment of length N of
    STRING.  */

contrib/tools/m4/lib/xstrndup.c

@@ -53,10 +53,7 @@ xstrcat (size_t argcount, va_list args)
      vasprintf().  */
   if (totalsize == SIZE_MAX || totalsize > INT_MAX)
     {
-#if (defined _MSC_VER) && (_MSC_VER < 1800)
-#else
       errno = EOVERFLOW;
-#endif
       return NULL;
     }
 
@@ -75,10 +72,6 @@ xstrcat (size_t argcount, va_list args)
   return result;
 }
 
-#if defined(_MSC_VER)
-int vasprintf(char **resultp, const char *format, va_list args);
-#endif
-
 char *
 xvasprintf (const char *format, va_list args)
 {