From: Tim Kientzle Date: Thu, 11 Sep 2008 22:46:08 +0000 (-0400) Subject: Style fixes: Use Unix-style line endings for consistency with X-Git-Tag: v2.6.0~92 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2c44bcb12e599af47fcd4014ead2082c2874cc2;p=thirdparty%2Flibarchive.git Style fixes: Use Unix-style line endings for consistency with rest of source (fortunately, most Windows code editors are agnostic about line endings). Remove trailing spaces, tab after #define, remove a couple of definitions that are not actually used in the source. SVN-Revision: 201 --- diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h index 1b63992ed..56423d865 100644 --- a/libarchive/archive_windows.h +++ b/libarchive/archive_windows.h @@ -27,12 +27,12 @@ */ #ifndef LIBARCHIVE_NONPOSIX_H_INCLUDED -#define LIBARCHIVE_NONPOSIX_H_INCLUDED +#define LIBARCHIVE_NONPOSIX_H_INCLUDED /* Start of configuration for native Win32 */ #include -#define set_errno(val) ((errno)=val) +#define set_errno(val) ((errno)=val) #include #include //brings in NULL #include @@ -42,19 +42,6 @@ //#define EFTYPE 7 -#if !defined(STDIN_FILENO) -#define STDIN_FILENO 0 -#endif - -#if !defined(STDOUT_FILENO) -#define STDOUT_FILENO 1 -#endif - -#if !defined(STDERR_FILENO) -#define STDERR_FILENO 2 -#endif - - #if defined(_MSC_VER) /* TODO: Fix the code, don't suppress the warnings. */ #pragma warning(disable:4244) /* 'conversion' conversion from 'type1' to 'type2', possible loss of data */ @@ -65,9 +52,9 @@ #ifndef NULL #ifdef __cplusplus -#define NULL 0 +#define NULL 0 #else -#define NULL ((void *)0) +#define NULL ((void *)0) #endif #endif @@ -83,7 +70,7 @@ //#define fileno _fileno #define fstat _fstat #define lseek _lseek -#define lstat _stat +#define lstat _stat #define open _open #define stat _stat #define mkdir(d,m) _mkdir(d) @@ -95,87 +82,87 @@ #define umask _umask #define write _write -#define O_RDONLY _O_RDONLY +#define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY #define O_TRUNC _O_TRUNC #define O_CREAT _O_CREAT #define O_EXCL _O_EXCL #ifndef _S_IFIFO - #define _S_IFIFO 0010000 /* pipe */ + #define _S_IFIFO 0010000 /* pipe */ #endif #ifndef _S_IFCHR - #define _S_IFCHR 0020000 /* character special */ + #define _S_IFCHR 0020000 /* character special */ #endif #ifndef _S_IFDIR - #define _S_IFDIR 0040000 /* directory */ + #define _S_IFDIR 0040000 /* directory */ #endif #ifndef _S_IFBLK - #define _S_IFBLK 0060000 /* block special */ + #define _S_IFBLK 0060000 /* block special */ #endif #ifndef _S_IFLNK - #define _S_IFLNK 0120000 /* symbolic link */ + #define _S_IFLNK 0120000 /* symbolic link */ #endif #ifndef _S_IFSOCK - #define _S_IFSOCK 0140000 /* socket */ + #define _S_IFSOCK 0140000 /* socket */ #endif #ifndef _S_IFREG - #define _S_IFREG 0100000 /* regular */ + #define _S_IFREG 0100000 /* regular */ #endif #ifndef _S_IFMT - #define _S_IFMT 0170000 /* file type mask */ + #define _S_IFMT 0170000 /* file type mask */ #endif -#define S_IFIFO _S_IFIFO -//#define S_IFCHR _S_IFCHR -//#define S_IFDIR _S_IFDIR -#define S_IFBLK _S_IFBLK -#define S_IFLNK _S_IFLNK -#define S_IFSOCK _S_IFSOCK -//#define S_IFREG _S_IFREG -//#define S_IFMT _S_IFMT +#define S_IFIFO _S_IFIFO +//#define S_IFCHR _S_IFCHR +//#define S_IFDIR _S_IFDIR +#define S_IFBLK _S_IFBLK +#define S_IFLNK _S_IFLNK +#define S_IFSOCK _S_IFSOCK +//#define S_IFREG _S_IFREG +//#define S_IFMT _S_IFMT #define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) /* block special */ #define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) /* fifo or socket */ #define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) /* char special */ #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) /* directory */ #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) /* regular file */ -#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) /* Symbolic link */ -#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) /* Socket */ - -#define _S_ISUID 0004000 /* set user id on execution */ -#define _S_ISGID 0002000 /* set group id on execution */ -#define _S_ISVTX 0001000 /* save swapped text even after use */ - -#define S_ISUID _S_ISUID -#define S_ISGID _S_ISGID -#define S_ISVTX _S_ISVTX - -#define _S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC) -#define _S_IXUSR _S_IEXEC /* read permission, user */ -#define _S_IWUSR _S_IWRITE /* write permission, user */ -#define _S_IRUSR _S_IREAD /* execute/search permission, user */ -#define _S_IRWXG (_S_IRWXU >> 3) -#define _S_IXGRP (_S_IXUSR >> 3) /* read permission, group */ -#define _S_IWGRP (_S_IWUSR >> 3) /* write permission, group */ -#define _S_IRGRP (_S_IRUSR >> 3) /* execute/search permission, group */ -#define _S_IRWXO (_S_IRWXG >> 3) -#define _S_IXOTH (_S_IXGRP >> 3) /* read permission, other */ -#define _S_IWOTH (_S_IWGRP >> 3) /* write permission, other */ -#define _S_IROTH (_S_IRGRP >> 3) /* execute/search permission, other */ - -#define S_IRWXU _S_IRWXU -#define S_IXUSR _S_IXUSR -#define S_IWUSR _S_IWUSR -#define S_IRUSR _S_IRUSR -#define S_IRWXG _S_IRWXG -#define S_IXGRP _S_IXGRP -#define S_IWGRP _S_IWGRP -#define S_IRGRP _S_IRGRP -#define S_IRWXO _S_IRWXO -#define S_IXOTH _S_IXOTH -#define S_IWOTH _S_IWOTH -#define S_IROTH _S_IROTH +#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) /* Symbolic link */ +#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) /* Socket */ + +#define _S_ISUID 0004000 /* set user id on execution */ +#define _S_ISGID 0002000 /* set group id on execution */ +#define _S_ISVTX 0001000 /* save swapped text even after use */ + +#define S_ISUID _S_ISUID +#define S_ISGID _S_ISGID +#define S_ISVTX _S_ISVTX + +#define _S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC) +#define _S_IXUSR _S_IEXEC /* read permission, user */ +#define _S_IWUSR _S_IWRITE /* write permission, user */ +#define _S_IRUSR _S_IREAD /* execute/search permission, user */ +#define _S_IRWXG (_S_IRWXU >> 3) +#define _S_IXGRP (_S_IXUSR >> 3) /* read permission, group */ +#define _S_IWGRP (_S_IWUSR >> 3) /* write permission, group */ +#define _S_IRGRP (_S_IRUSR >> 3) /* execute/search permission, group */ +#define _S_IRWXO (_S_IRWXG >> 3) +#define _S_IXOTH (_S_IXGRP >> 3) /* read permission, other */ +#define _S_IWOTH (_S_IWGRP >> 3) /* write permission, other */ +#define _S_IROTH (_S_IRGRP >> 3) /* execute/search permission, other */ + +#define S_IRWXU _S_IRWXU +#define S_IXUSR _S_IXUSR +#define S_IWUSR _S_IWUSR +#define S_IRUSR _S_IRUSR +#define S_IRWXG _S_IRWXG +#define S_IXGRP _S_IXGRP +#define S_IWGRP _S_IWGRP +#define S_IRGRP _S_IRGRP +#define S_IRWXO _S_IRWXO +#define S_IXOTH _S_IXOTH +#define S_IWOTH _S_IWOTH +#define S_IROTH _S_IROTH #define F_DUPFD 0 /* Duplicate file descriptor. */ #define F_GETFD 1 /* Get file descriptor flags. */ @@ -189,23 +176,23 @@ #define F_SETLKW 9 /* Set record locking info (blocking). */ /* XXX missing */ -#define F_GETLK64 7 /* Get record locking info. */ -#define F_SETLK64 8 /* Set record locking info (non-blocking). */ -#define F_SETLKW64 9 /* Set record locking info (blocking). */ +#define F_GETLK64 7 /* Get record locking info. */ +#define F_SETLK64 8 /* Set record locking info (non-blocking). */ +#define F_SETLKW64 9 /* Set record locking info (blocking). */ /* File descriptor flags used with F_GETFD and F_SETFD. */ #define FD_CLOEXEC 1 /* Close on exec. */ //NOT SURE IF O_NONBLOCK is OK here but at least the 0x0004 flag is not used by anything else... -#define O_NONBLOCK 0x0004 /* Non-blocking I/O. */ -//#define O_NDELAY O_NONBLOCK +#define O_NONBLOCK 0x0004 /* Non-blocking I/O. */ +//#define O_NDELAY O_NONBLOCK /* Symbolic constants for the access() function */ #if !defined(F_OK) - #define R_OK 4 /* Test for read permission */ - #define W_OK 2 /* Test for write permission */ - #define X_OK 1 /* Test for execute permission */ - #define F_OK 0 /* Test for existence of file */ + #define R_OK 4 /* Test for read permission */ + #define W_OK 2 /* Test for write permission */ + #define X_OK 1 /* Test for execute permission */ + #define F_OK 0 /* Test for existence of file */ #endif @@ -220,9 +207,9 @@ #if __USE_LARGEFILE && __USE_FILE_OFFSET64 /* replace stat and seek by their large-file equivalents */ #undef stat -#define stat _stati64 +#define stat _stati64 #undef fstat -#define fstat _fstati64 +#define fstat _fstati64 #undef lseek #define lseek _lseeki64 diff --git a/libarchive/config_windows.h b/libarchive/config_windows.h index 062f249f2..5afda4533 100644 --- a/libarchive/config_windows.h +++ b/libarchive/config_windows.h @@ -1,33 +1,32 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ #ifndef CONFIG_H_INCLUDED -#define CONFIG_H_INCLUDED - +#define CONFIG_H_INCLUDED /////////////////////////////////////////////////////////////////////////// // Check for Watcom and Microsoft Visual C compilers (WIN32 only) /////// /////////////////////////////////////////////////////////////////////////// #if defined(__WIN32__) || defined(_WIN32) || defined(__WIN32) - #define IS_WIN32 1 + #define IS_WIN32 1 #if defined(__TURBOC__) || defined(__BORLANDC__) /* Borland compilers */ #elif defined( __WATCOMC__ ) || defined(__WATCOMCPP__) /* Watcom compilers */ - #define IS_WATCOM 1 + #define IS_WATCOM 1 /* Define to 1 if __INT64 is defined */ #elif defined(__IBMC__) || defined(__IBMCPP__) /* IBM compilers */ #elif defined( __SC__ ) /* Symantec C++ compilers */ #elif defined( M_I86 ) && defined( MSDOS ) /* Microsoft DOS/Win 16 compilers */ #elif defined( _M_IX86 ) || defined( _68K_ ) /* Microsoft Win32 compilers */ - #define IS_VISUALC 1 + #define IS_VISUALC 1 /* Define to 1 if __INT64 is defined */ #else #endif /* Define to 1 if UID should be unsigned */ - #define USE_UNSIGNED_UID 1 + #define USE_UNSIGNED_UID 1 /* Define to 1 if UID should be unsigned */ - #define USE_UNSIGNED_GID 1 + #define USE_UNSIGNED_GID 1 #endif /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// @@ -73,18 +72,18 @@ /* Define to 1 if you have the declaration of `INT64_MAX', and to 0 if you don't. */ -#if defined(_MSC_VER) +#if defined(_MSC_VER) /* #undef HAVE_DECL_INT64_MAX */ #else -#define HAVE_DECL_INT64_MAX 1 +#define HAVE_DECL_INT64_MAX 1 #endif /* Define to 1 if you have the declaration of `INT64_MIN', and to 0 if you don't. */ -#if defined(_MSC_VER) +#if defined(_MSC_VER) /* #undef HAVE_DECL_INT64_MIN */ #else -#define HAVE_DECL_INT64_MIN 1 +#define HAVE_DECL_INT64_MIN 1 #endif /* Define to 1 if you have the declaration of `optarg', and to 0 if you don't. @@ -97,14 +96,14 @@ /* Define to 1 if you have the declaration of `SIZE_MAX', and to 0 if you don't. */ -#if defined(_MSC_VER) +#if defined(_MSC_VER) #if _MSC_VER >= 1400 - #define HAVE_DECL_SIZE_MAX 1 + #define HAVE_DECL_SIZE_MAX 1 #else /* #undef HAVE_DECL_SIZE_MAX */ #endif #else -#define HAVE_DECL_SIZE_MAX 1 +#define HAVE_DECL_SIZE_MAX 1 #endif /* Define to 1 if you have the declaration of `SSIZE_MAX', and to 0 if you @@ -117,18 +116,18 @@ /* Define to 1 if you have the declaration of `UINT32_MAX', and to 0 if you don't. */ -#if defined(_MSC_VER) +#if defined(_MSC_VER) /* #undef HAVE_DECL_UINT32_MAX */ #else -#define HAVE_DECL_UINT32_MAX 1 +#define HAVE_DECL_UINT32_MAX 1 #endif /* Define to 1 if you have the declaration of `UINT64_MAX', and to 0 if you don't. */ -#if defined(_MSC_VER) +#if defined(_MSC_VER) /* #undef HAVE_DECL_UINT64_MAX */ #else -#define HAVE_DECL_UINT64_MAX 1 +#define HAVE_DECL_UINT64_MAX 1 #endif /* Define to 1 if you have the header file, and it defines `DIR'. @@ -148,10 +147,10 @@ /* #undef HAVE_EFTYPE */ /* A possible errno value for invalid file format errors */ -#define HAVE_EILSEQ 1 +#define HAVE_EILSEQ 1 /* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 +#define HAVE_ERRNO_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_EXT2FS_EXT2_FS_H */ @@ -169,7 +168,7 @@ /* #undef HAVE_FCHOWN */ /* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 +#define HAVE_FCNTL_H 1 /* Define to 1 if you have the fcntl() function. */ /* #undef HAVE_FCNTL_FN */ @@ -238,7 +237,7 @@ /* #undef HAVE_LIBZ */ /* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 +#define HAVE_LIMITS_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_LINUX_EXT2_FS_H */ @@ -253,10 +252,10 @@ /* #undef HAVE_LLISTXATTR */ /* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 +#define HAVE_LOCALE_H 1 /* Define to 1 if the system has the type `long long int'. */ -#define HAVE_LONG_LONG_INT 1 +#define HAVE_LONG_LONG_INT 1 /* Define to 1 if you have the `lsetxattr' function. */ /* #undef HAVE_LSETXATTR */ @@ -269,16 +268,16 @@ /* #undef HAVE_LUTIMES */ /* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 +#define HAVE_MEMMOVE 1 /* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 +#define HAVE_MEMORY_H 1 /* Define to 1 if you have the `memset' function. */ -#define HAVE_MEMSET 1 +#define HAVE_MEMSET 1 /* Define to 1 if you have the `mkdir' function. */ -#define HAVE_MKDIR 1 +#define HAVE_MKDIR 1 /* Define to 1 if you have the `mkfifo' function. */ /* #undef HAVE_MKFIFO */ @@ -308,48 +307,48 @@ /* #undef HAVE_SELECT */ /* Define to 1 if you have the `setlocale' function. */ -#define HAVE_SETLOCALE 1 +#define HAVE_SETLOCALE 1 /* Define to 1 if `stat' has the bug that it succeeds when given the zero-length file name argument. */ /* #undef HAVE_STAT_EMPTY_STRING_BUG */ /* Define to 1 if you have the header file. */ -#define HAVE_STDARG_H 1 +#define HAVE_STDARG_H 1 /* Define to 1 if you have the header file. */ #if defined(_MSC_VER) /* #undef HAVE_STDINT_H */ #else -#define HAVE_STDINT_H 1 +#define HAVE_STDINT_H 1 #endif /* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 +#define HAVE_STDLIB_H 1 /* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 +#define HAVE_STRCHR 1 /* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 +#define HAVE_STRDUP 1 /* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 +#define HAVE_STRERROR 1 /* Define to 1 if you have the `strerror_r' function. */ /* #undef HAVE_STRERROR_R */ /* Define to 1 if you have the `strftime' function. */ -#define HAVE_STRFTIME 1 +#define HAVE_STRFTIME 1 /* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 +#define HAVE_STRINGS_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 +#define HAVE_STRING_H 1 /* Define to 1 if you have the `strrchr' function. */ -#define HAVE_STRRCHR 1 +#define HAVE_STRRCHR 1 /* Define to 1 if `st_mtimespec.tv_nsec' is member of `struct stat'. */ /* #undef HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC */ @@ -381,20 +380,20 @@ /* #undef HAVE_SYS_SELECT_H */ /* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_STAT_H 1 /* Define to 1 if you have the header file. */ #if defined(_MSC_VER) /* #undef HAVE_SYS_TIME_H */ #else -#define HAVE_SYS_TIME_H 1 +#define HAVE_SYS_TIME_H 1 #endif /* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_SYS_UTIME_H 1 +#define HAVE_SYS_UTIME_H 1 /* Define to 1 if you have that is POSIX.1 compatible. */ /* #undef HAVE_SYS_WAIT_H */ @@ -403,30 +402,30 @@ /* #undef HAVE_TIMEGM */ /* Define to 1 if you have the header file. */ -#define HAVE_TIME_H 1 +#define HAVE_TIME_H 1 /* Define to 1 if the system has the type `uintmax_t'. */ #if defined(_MSC_VER) /* #undef HAVE_UINTMAX_T */ #else -#define HAVE_UINTMAX_T 1 +#define HAVE_UINTMAX_T 1 #endif /* Define to 1 if you have the header file. */ #if defined(_MSC_VER) /* #undef HAVE_UNISTD_H */ #else -#define HAVE_UNISTD_H 1 +#define HAVE_UNISTD_H 1 #endif /* Define to 1 if the system has the type `unsigned long long'. */ -#define HAVE_UNSIGNED_LONG_LONG 1 +#define HAVE_UNSIGNED_LONG_LONG 1 /* Define to 1 if the system has the type `unsigned long long int'. */ -#define HAVE_UNSIGNED_LONG_LONG_INT 1 +#define HAVE_UNSIGNED_LONG_LONG_INT 1 /* Define to 1 if you have the `utime' function. */ -#define HAVE_UTIME 1 +#define HAVE_UTIME 1 /* Define to 1 if you have the `utimes' function. */ /* #undef HAVE_UTIMES */ @@ -435,16 +434,16 @@ /* #undef HAVE_UTIME_H */ /* Define to 1 if you have the `vprintf' function. */ -#define HAVE_VPRINTF 1 +#define HAVE_VPRINTF 1 /* Define to 1 if you have the header file. */ -#define HAVE_WCHAR_H 1 +#define HAVE_WCHAR_H 1 /* Define to 1 if you have the `wcscpy' function. */ -#define HAVE_WCSCPY 1 +#define HAVE_WCSCPY 1 /* Define to 1 if you have the `wcslen' function. */ -#define HAVE_WCSLEN 1 +#define HAVE_WCSLEN 1 /* Define to 1 if you have the `wmemcmp' function. */ /* #undef HAVE_WMEMCMP */ @@ -455,12 +454,6 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_ZLIB_H */ -/* Version number of libarchive as a single integer */ -#define LIBARCHIVE_VERSION_NUMBER "2005005" - -/* Version number of libarchive */ -#define LIBARCHIVE_VERSION_STRING "2.5.5" - /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ /* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */ @@ -476,35 +469,14 @@ /* Define to 1 if your C compiler doesn't accept -c and -o together. */ /* #undef NO_MINUS_C_MINUS_O */ -/* Name of package */ -#define PACKAGE "libarchive" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "kientzle@freebsd.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "libarchive" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libarchive 2.5.5" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "libarchive" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.5.5" - /* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +#define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ /* #undef STRERROR_R_CHAR_P */ /* Define to 1 if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - -/* Version number of package */ -#define VERSION "2.5.5" +#define TIME_WITH_SYS_TIME 1 /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ @@ -517,7 +489,7 @@ /* Define for Solaris 2.5.1 so the uint64_t typedef from , , or is not used. If the typedef was allowed, the - #define below would cause a syntax error. */ + #define below would cause a syntax error. */ /* #undef _UINT64_T */ /* Define to empty if `const' does not conform to ANSI C. */ @@ -525,18 +497,18 @@ /* Define to `int' if doesn't define. */ #if (USE_UNSIGNED_GID) -#define gid_t unsigned int +#define gid_t unsigned int #else -#define gid_t int +#define gid_t int #endif /* Define to `unsigned long' if does not define. */ -#define id_t int +#define id_t int /* Define to the type of a signed integer type of width exactly 64 bits if such a type exists and the standard includes do not define it. */ #if defined(_MSC_VER) -#define int64_t long long +#define int64_t long long #else /* #undef int64_t */ #endif @@ -544,14 +516,14 @@ /* Define to the widest signed integer type if and do not define. */ #if defined(_MSC_VER) -#define intmax_t long long +#define intmax_t long long #else /* #undef intmax_t */ #endif /* Define to `int' if does not define. */ #if defined(_MSC_VER) -#define mode_t unsigned short +#define mode_t unsigned short #else /* #undef mode_t */ #endif @@ -564,15 +536,15 @@ /* Define to `int' if doesn't define. */ #if (USE_UNSIGNED_UID) -#define uid_t unsigned int +#define uid_t unsigned int #else -#define uid_t int +#define uid_t int #endif /* Define to the type of an unsigned integer type of width exactly 64 bits if such a type exists and the standard includes do not define it. */ #if defined(_MSC_VER) -#define uint64_t unsigned long long +#define uint64_t unsigned long long #else /* #undef uint64_t */ #endif @@ -580,7 +552,7 @@ /* Define to the widest unsigned integer type if and do not define. */ #if defined(_MSC_VER) -#define uintmax_t unsigned long long +#define uintmax_t unsigned long long #else /* #undef uintmax_t */ #endif @@ -590,15 +562,15 @@ /* Define to `unsigned int' if does not define. */ #if defined(_MSC_VER) -#define pid_t unsigned int +#define pid_t unsigned int #else /* #undef pid_t */ #endif #if defined(_MSC_VER) -#define uint32_t unsigned long -#define uint16_t unsigned short -#define ssize_t long +#define uint32_t unsigned long +#define uint16_t unsigned short +#define ssize_t long #endif #include "archive_windows.h"