diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2014-05-04 11:07:17 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2014-05-04 11:07:17 +0300 |
| commit | 4d5b7b3fda31241ca86ed35e08e73f776ee916e0 (patch) | |
| tree | 74399fadc97b8a7c2627e99ab1de3b66477e57eb /src/liblzma | |
| parent | Build: Fix the combination of --disable-xzdec --enable-lzmadec. (diff) | |
| download | xz-4d5b7b3fda31241ca86ed35e08e73f776ee916e0.tar.xz | |
liblzma: Rename the private API header lzma/lzma.h to lzma/lzma12.h.
It can be confusing that two header files have the same name.
The public API file is still lzma.h.
Diffstat (limited to '')
| -rw-r--r-- | src/liblzma/api/Makefile.am | 2 | ||||
| -rw-r--r-- | src/liblzma/api/lzma.h | 2 | ||||
| -rw-r--r-- | src/liblzma/api/lzma/lzma12.h (renamed from src/liblzma/api/lzma/lzma.h) | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/liblzma/api/Makefile.am b/src/liblzma/api/Makefile.am index e016de58..db246000 100644 --- a/src/liblzma/api/Makefile.am +++ b/src/liblzma/api/Makefile.am @@ -17,7 +17,7 @@ nobase_include_HEADERS = \ lzma/hardware.h \ lzma/index.h \ lzma/index_hash.h \ - lzma/lzma.h \ + lzma/lzma12.h \ lzma/stream_flags.h \ lzma/version.h \ lzma/vli.h diff --git a/src/liblzma/api/lzma.h b/src/liblzma/api/lzma.h index fb874c3e..72c51b24 100644 --- a/src/liblzma/api/lzma.h +++ b/src/liblzma/api/lzma.h @@ -286,7 +286,7 @@ extern "C" { #include "lzma/filter.h" #include "lzma/bcj.h" #include "lzma/delta.h" -#include "lzma/lzma.h" +#include "lzma/lzma12.h" /* Container formats */ #include "lzma/container.h" diff --git a/src/liblzma/api/lzma/lzma.h b/src/liblzma/api/lzma/lzma12.h index 3f8e095f..4e32fa3a 100644 --- a/src/liblzma/api/lzma/lzma.h +++ b/src/liblzma/api/lzma/lzma12.h @@ -1,5 +1,5 @@ /** - * \file lzma/lzma.h + * \file lzma/lzma12.h * \brief LZMA1 and LZMA2 filters */ |