*** regex.c.orig	Tue Jun 01 03:05:24 1993
--- regex.c	Tue Jun 01 03:08:59 1993
***************
*** 48,55 ****
  
  /* We used to test for `BSTRING' here, but only GCC and Emacs define
     `BSTRING', as far as I know, and neither of them use this code.  */
! #if HAVE_STRING_H || STDC_HEADERS
  #include <string.h>
  #ifndef bcmp
  #define bcmp(s1, s2, n)	memcmp ((s1), (s2), (n))
  #endif
--- 48,56 ----
  
  /* We used to test for `BSTRING' here, but only GCC and Emacs define
     `BSTRING', as far as I know, and neither of them use this code.  */
! #if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
  #include <string.h>
+ #ifndef HAVE_BSTRING
  #ifndef bcmp
  #define bcmp(s1, s2, n) memcmp ((s1), (s2), (n))
  #endif
***************
*** 59,64 ****
--- 60,66 ----
  #ifndef bzero
  #define bzero(s, n)     memset ((s), 0, (n))
  #endif
+ #endif
  #else
  #include <strings.h>
  #endif
***************
*** 192,198 ****
  #ifdef __GNUC__
  #define alloca __builtin_alloca
  #else /* not __GNUC__ */
! #if HAVE_ALLOCA_H
  #include <alloca.h>
  #else /* not __GNUC__ or HAVE_ALLOCA_H */
  #ifndef _AIX /* Already did AIX, up at the top.  */
--- 194,200 ----
  #ifdef __GNUC__
  #define alloca __builtin_alloca
  #else /* not __GNUC__ */
! #ifdef HAVE_ALLOCA_H
  #include <alloca.h>
  #else /* not __GNUC__ or HAVE_ALLOCA_H */
  #ifndef _AIX /* Already did AIX, up at the top.  */
*** sed.c.orig	Tue Jun 01 03:05:23 1993
--- sed.c	Tue Jun 01 03:14:02 1993
***************
*** 68,74 ****
--- 68,83 ----
  #endif
  #endif
  
+ #ifdef AMIGA
+ const char amiga_version[] = "\0$VER: GNU sed version 1.17";
+ const char *version_string = &amiga_version[7];
+ #if defined(_DCC) && defined(DCC_DYNAMIC_STACKS)
+ long _stack_fudge = 4*1024;
+ long _stack_chunk = 32*1024;
+ #endif
+ #else
  char *version_string = "GNU sed version 1.17";
+ #endif
  
  /* Struct vector is used to describe a chunk of a compiled sed program.
   * There is one vector for the main program, and one for each { } pair,
***************
*** 1177,1182 ****
--- 1186,1192 ----
        if (input_file == 0)
          {
            extern int errno;
+ #ifndef __STDC__
            extern char *sys_errlist[];
            extern int sys_nerr;
  
***************
*** 1184,1189 ****
--- 1194,1204 ----
  
            ptr = ((errno >= 0 && errno < sys_nerr)
                   ? sys_errlist[errno] : "Unknown error code");
+ #else
+           char *ptr;
+ 
+           ptr = strerror(errno);
+ #endif
            bad_input++;
            fprintf (stderr, "%s: can't read %s: %s\n", myname, name, ptr);
            return;