diff options
| author | Brad King <brad.king@kitware.com> | 2011-02-14 21:34:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-02-14 21:34:11 (GMT) |
| commit | 42a5e8d978a316620027b32eeb976a5b8758d8ba (patch) | |
| tree | bbb95386d592a75df6a7c726c814e61d4515b90d /Utilities/cmlibarchive/libarchive/archive_windows.h | |
| parent | 2a2fca24aa0058bb12f20d3d860c23123f902b74 (diff) | |
| parent | ee55a4f70906a41db18df07de89383f0aa948c71 (diff) | |
| download | CMake-42a5e8d978a316620027b32eeb976a5b8758d8ba.zip CMake-42a5e8d978a316620027b32eeb976a5b8758d8ba.tar.gz CMake-42a5e8d978a316620027b32eeb976a5b8758d8ba.tar.bz2 | |
Merge topic 'linux-standard-base'
ee55a4f libarchive: Use OpenSSL only if CMAKE_USE_OPENSSL (#11815)
41b7b3e libarchive: Define major/minor/makedev only where needed (#11648)
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_windows.h')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_windows.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_windows.h b/Utilities/cmlibarchive/libarchive/archive_windows.h index 17f5698..f85f3f0 100644 --- a/Utilities/cmlibarchive/libarchive/archive_windows.h +++ b/Utilities/cmlibarchive/libarchive/archive_windows.h @@ -94,11 +94,6 @@ #endif #endif -/* Replacement for major/minor/makedev. */ -#define major(x) ((int)(0x00ff & ((x) >> 8))) -#define minor(x) ((int)(0xffff00ff & (x))) -#define makedev(maj,min) ((0xff00 & ((maj)<<8))|(0xffff00ff & (min))) - /* Alias the Windows _function to the POSIX equivalent. */ #define access _access #define chdir __la_chdir |