Deleted Added
full compact
archive.h (349524) archive.h (353376)
1/*-
2 * Copyright (c) 2003-2010 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 8 unchanged lines hidden (view full) ---

17 * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
1/*-
2 * Copyright (c) 2003-2010 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 8 unchanged lines hidden (view full) ---

17 * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
25 * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive.h 349524 2019-06-28 22:33:44Z mm $
25 * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive.h 353376 2019-10-09 22:19:06Z mm $
26 */
27
28#ifndef ARCHIVE_H_INCLUDED
29#define ARCHIVE_H_INCLUDED
30
31/*
32 * The version number is expressed as a single integer that makes it
33 * easy to compare versions at build time: for version a.b.c, the

--- 13 unchanged lines hidden (view full) ---

47 * Note: archive.h is for use outside of libarchive; the configuration
48 * headers (config.h, archive_platform.h, etc.) are purely internal.
49 * Do NOT use HAVE_XXX configuration macros to control the behavior of
50 * this header! If you must conditionalize, use predefined compiler and/or
51 * platform macros.
52 */
53#if defined(__BORLANDC__) && __BORLANDC__ >= 0x560
54# include <stdint.h>
26 */
27
28#ifndef ARCHIVE_H_INCLUDED
29#define ARCHIVE_H_INCLUDED
30
31/*
32 * The version number is expressed as a single integer that makes it
33 * easy to compare versions at build time: for version a.b.c, the

--- 13 unchanged lines hidden (view full) ---

47 * Note: archive.h is for use outside of libarchive; the configuration
48 * headers (config.h, archive_platform.h, etc.) are purely internal.
49 * Do NOT use HAVE_XXX configuration macros to control the behavior of
50 * this header! If you must conditionalize, use predefined compiler and/or
51 * platform macros.
52 */
53#if defined(__BORLANDC__) && __BORLANDC__ >= 0x560
54# include <stdint.h>
55#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(_SCO_DS) && !defined(__osf__)
55#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(_SCO_DS) && !defined(__osf__) && !defined(__CLANG_INTTYPES_H)
56# include <inttypes.h>
57#endif
58
59/* Get appropriate definitions of 64-bit integer */
60#if !defined(__LA_INT64_T_DEFINED)
61/* Older code relied on the __LA_INT64_T macro; after 4.0 we'll switch to the typedef exclusively. */
62# if ARCHIVE_VERSION_NUMBER < 4000000
63#define __LA_INT64_T la_int64_t

--- 1132 unchanged lines hidden ---
56# include <inttypes.h>
57#endif
58
59/* Get appropriate definitions of 64-bit integer */
60#if !defined(__LA_INT64_T_DEFINED)
61/* Older code relied on the __LA_INT64_T macro; after 4.0 we'll switch to the typedef exclusively. */
62# if ARCHIVE_VERSION_NUMBER < 4000000
63#define __LA_INT64_T la_int64_t

--- 1132 unchanged lines hidden ---