Changeset d0df2d5 in rtems


Ignore:
Timestamp:
Mar 18, 2011, 10:11:44 AM (9 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.11, master
Children:
c80c2f2
Parents:
3d7bcc7 (diff), 6557362 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

This commit was generated by cvs2svn to compensate for changes in r25208,
which included commits to RCS files with non-trunk default branches.

Location:
cpukit/zlib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/zlib/zconf.h.cmakein

    r3d7bcc7 rd0df2d5  
    318318#endif
    319319
    320 #ifdef HAVE_VISIBILITY_PRAGMA
    321 #  define ZEXTERN __attribute__((visibility ("default"))) extern
    322 #endif
    323 
    324320#ifndef ZEXTERN
    325321#  define ZEXTERN extern
     
    367363#endif
    368364
    369 #ifdef Z_HAVE_UNISTD_H
     365#ifdef STDC
    370366#  include <sys/types.h>    /* for off_t */
     367#endif
     368
     369/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
     370 * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
     371 * though the former does not conform to the LFS document), but considering
     372 * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
     373 * equivalently requesting no 64-bit operations
     374 */
     375#if -_LARGEFILE64_SOURCE - -1 == 1
     376#  undef _LARGEFILE64_SOURCE
     377#endif
     378
     379#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
    371380#  include <unistd.h>       /* for SEEK_* and off_t */
    372381#  ifdef VMS
     
    376385#    define z_off_t off_t
    377386#  endif
    378 #endif
    379 
    380 #ifdef _LARGEFILE64_SOURCE
    381 #  include <sys/types.h>
    382387#endif
    383388
     
    387392#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
    388393#endif
     394
    389395#ifndef z_off_t
    390396#  define z_off_t long
     397#endif
     398
     399#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
     400#  define z_off64_t off64_t
     401#else
     402#  define z_off64_t z_off_t
    391403#endif
    392404
  • cpukit/zlib/zconf.h.in

    r3d7bcc7 rd0df2d5  
    316316#endif
    317317
    318 #ifdef HAVE_VISIBILITY_PRAGMA
    319 #  define ZEXTERN __attribute__((visibility ("default"))) extern
    320 #endif
    321 
    322318#ifndef ZEXTERN
    323319#  define ZEXTERN extern
     
    365361#endif
    366362
    367 #ifdef Z_HAVE_UNISTD_H
     363#ifdef STDC
    368364#  include <sys/types.h>    /* for off_t */
     365#endif
     366
     367/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
     368 * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
     369 * though the former does not conform to the LFS document), but considering
     370 * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
     371 * equivalently requesting no 64-bit operations
     372 */
     373#if -_LARGEFILE64_SOURCE - -1 == 1
     374#  undef _LARGEFILE64_SOURCE
     375#endif
     376
     377#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
    369378#  include <unistd.h>       /* for SEEK_* and off_t */
    370379#  ifdef VMS
     
    374383#    define z_off_t off_t
    375384#  endif
    376 #endif
    377 
    378 #ifdef _LARGEFILE64_SOURCE
    379 #  include <sys/types.h>
    380385#endif
    381386
     
    385390#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
    386391#endif
     392
    387393#ifndef z_off_t
    388394#  define z_off_t long
     395#endif
     396
     397#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
     398#  define z_off64_t off64_t
     399#else
     400#  define z_off64_t z_off_t
    389401#endif
    390402
Note: See TracChangeset for help on using the changeset viewer.