Merge tag 'upstream/1.6'

[debian/gzip] / tailor.h

diff --git a/tailor.h b/tailor.h
index 1dcf2d8b821bc72984114a678198da46fd1f0403..0bf88ffe127618deec3c02476585e861b5fcd70d 100644 (file)
--- a/tailor.h
+++ b/tailor.h
@@ -1,11 +1,12 @@
 /* tailor.h -- target dependent definitions
 
 /* tailor.h -- target dependent definitions
 

-   Copyright (C) 1997, 1998, 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-1999, 2002, 2006, 2009-2013 Free Software Foundation,
+   Inc.

    Copyright (C) 1992-1993 Jean-loup Gailly
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Copyright (C) 1992-1993 Jean-loup Gailly
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -21,8 +22,6 @@
  * The target dependent functions should be defined in tailor.c.
  */
 
  * The target dependent functions should be defined in tailor.c.
  */
 

-/* $Id: tailor.h,v 1.5 2006/12/07 06:58:13 eggert Exp $ */
-

 #if defined(__MSDOS__) && !defined(MSDOS)
 #  define MSDOS
 #endif
 #if defined(__MSDOS__) && !defined(MSDOS)
 #  define MSDOS
 #endif


@@ -40,17 +39,12 @@
      /* DJGPP version 1.09+ on MS-DOS.
       * The DJGPP 1.09 stat() function must be upgraded before gzip will
       * fully work.
      /* DJGPP version 1.09+ on MS-DOS.
       * The DJGPP 1.09 stat() function must be upgraded before gzip will
       * fully work.

-      * No need for HAVE_DIRENT_H, since <unistd.h> defines POSIX_SOURCE which
-      * implies HAVE_DIRENT_H.

       */
 #    define near
 #  else
 #    define MAXSEG_64K
 #    ifdef __TURBOC__
 #      define off_t long
       */
 #    define near
 #  else
 #    define MAXSEG_64K
 #    ifdef __TURBOC__
 #      define off_t long

-#      ifdef __BORLANDC__
-#        define HAVE_DIRENT_H
-#      endif

 #      define HAVE_UTIME_H
 #    else /* MSC */
 #      define HAVE_SYS_UTIME_H
 #      define HAVE_UTIME_H
 #    else /* MSC */
 #      define HAVE_SYS_UTIME_H


@@ -101,12 +95,10 @@
 #  endif
 #  ifdef __EMX__
 #    define HAVE_SYS_UTIME_H
 #  endif
 #  ifdef __EMX__
 #    define HAVE_SYS_UTIME_H

-#    define HAVE_DIRENT_H

 #    define EXPAND(argc,argv) \
        {_response(&argc, &argv); _wildcard(&argc, &argv);}
 #  endif
 #  ifdef __BORLANDC__
 #    define EXPAND(argc,argv) \
        {_response(&argc, &argv); _wildcard(&argc, &argv);}
 #  endif
 #  ifdef __BORLANDC__

-#    define HAVE_DIRENT_H

 #    define HAVE_UTIME_H
 #  endif
 #  ifdef __ZTC__
 #    define HAVE_UTIME_H
 #  endif
 #  ifdef __ZTC__


@@ -163,6 +155,7 @@
 #  define PATH_SEP2 ':'
 #  define SUFFIX_SEP ';'
 #  define NO_MULTIPLE_DOTS
 #  define PATH_SEP2 ':'
 #  define SUFFIX_SEP ';'
 #  define NO_MULTIPLE_DOTS

+#  define NO_SIZE_CHECK

 #  define Z_SUFFIX "-gz"
 #  define RECORD_IO 1
 #  define casemap(c) tolow(c)
 #  define Z_SUFFIX "-gz"
 #  define RECORD_IO 1
 #  define casemap(c) tolow(c)


@@ -174,8 +167,6 @@
 #  define unlink delete
 #  ifdef VAXC
 #    include <unixio.h>
 #  define unlink delete
 #  ifdef VAXC
 #    include <unixio.h>

-#  else
-#    define HAVE_FCNTL_H

 #  endif
 #endif
 
 #  endif
 #endif
 


@@ -185,9 +176,6 @@
 #  define OS_CODE  0x01
 #  define ASMV
 #  ifdef __GNUC__
 #  define OS_CODE  0x01
 #  define ASMV
 #  ifdef __GNUC__

-#    define HAVE_DIRENT_H
-#    define HAVE_FCNTL_H
-#    define HAVE_UNISTD_H

 #    define HAVE_CHOWN
 #    define HAVE_LSTAT
 #  else /* SASC */
 #    define HAVE_CHOWN
 #    define HAVE_LSTAT
 #  else /* SASC */


@@ -197,16 +185,10 @@
 #    define direct dirent
      extern void _expand_args(int *argc, char ***argv);
 #    define EXPAND(argc,argv) _expand_args(&argc,&argv);
 #    define direct dirent
      extern void _expand_args(int *argc, char ***argv);
 #    define EXPAND(argc,argv) _expand_args(&argc,&argv);

-#    undef  O_BINARY /* disable useless --ascii option */

 #  endif
 #endif
 
 #if defined(ATARI) || defined(atarist)
 #  endif
 #endif
 
 #if defined(ATARI) || defined(atarist)

-#  ifndef STDC_HEADERS
-#    define STDC_HEADERS
-#    define HAVE_UNISTD_H
-#    define HAVE_DIRENT_H
-#  endif

 #  define ASMV
 #  define OS_CODE  0x05
 #  ifdef TOSFS
 #  define ASMV
 #  define OS_CODE  0x05
 #  ifdef TOSFS


@@ -233,31 +215,12 @@
 #  endif
 #endif
 
 #  endif
 #endif
 

-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define PATH_SEP '>'
-#  define STDC_HEADERS
-#  define NO_STDIN_FSTAT
-#  define NO_SIZE_CHECK
-#  define RECORD_IO  1
-#  define casemap(c)  tolow(c) /* Force file names to lower case */
-#  define put_char(c) put_byte((c) & 0x7F)
-#  define get_char(c) ascii2pascii(get_byte())
-#  define OS_CODE  0x0F    /* temporary, subject to change */
-#  ifdef SIGTERM
-#    undef SIGTERM         /* We don't want a signal handler for SIGTERM */
-#  endif
-#endif
-
-#if defined(pyr) && !defined(NOMEMCPY) /* Pyramid */
-#  define NOMEMCPY /* problem with overlapping copies */
-#endif
-

 #ifdef TOPS20
 #  define OS_CODE  0x0a
 #endif
 
 
 #ifdef TOPS20
 #  define OS_CODE  0x0a
 #endif
 
 

-       /* Common defaults */
+        /* Common defaults */

 
 #ifndef OS_CODE
 #  define OS_CODE  0x03  /* assume Unix */
 
 #ifndef OS_CODE
 #  define OS_CODE  0x03  /* assume Unix */


@@ -313,11 +276,3 @@
 #ifndef OPEN
 #  define OPEN(name, flags, mode) open_safer (name, flags, mode)
 #endif
 #ifndef OPEN
 #  define OPEN(name, flags, mode) open_safer (name, flags, mode)
 #endif

-
-#ifndef get_char
-#  define get_char() get_byte()
-#endif
-
-#ifndef put_char
-#  define put_char(c) put_byte(c)
-#endif