summaryrefslogtreecommitdiff
path: root/Build/source/utils/lzma-utils/src/liblzmadec/private.h
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-05-15 14:16:57 +0000
committerKarl Berry <karl@freefriends.org>2008-05-15 14:16:57 +0000
commitdfead18ba1f89b3f1da371199dff37f08a4a4200 (patch)
treeac6e95b933b4f7dfae5fc55919ab7a6f2b365f7f /Build/source/utils/lzma-utils/src/liblzmadec/private.h
parent9fc9c79b5aafe872a4da1fe59564b2a60aecb2ca (diff)
lzma-utils 4.32.6 from http://tukaani.org/lzma/download
git-svn-id: svn://tug.org/texlive/trunk@8158 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/lzma-utils/src/liblzmadec/private.h')
-rw-r--r--Build/source/utils/lzma-utils/src/liblzmadec/private.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/Build/source/utils/lzma-utils/src/liblzmadec/private.h b/Build/source/utils/lzma-utils/src/liblzmadec/private.h
index fa34b51e353..886b9dd0538 100644
--- a/Build/source/utils/lzma-utils/src/liblzmadec/private.h
+++ b/Build/source/utils/lzma-utils/src/liblzmadec/private.h
@@ -25,8 +25,11 @@
/* uint16_t would be enough for CProb. uint_fast16_t will give a little
extra speed but wastes memory. On 32-bit architechture the amount
of wasted memory is usually only a few kilobytes but the theoretical
- maximum is about 1.5 megabytes (4.5 on 64-bit). */
-#define CProb uint_fast16_t
+ maximum is about 1.5 megabytes (4.5 on 64-bit).
+
+ Update: Now we always use uint32_t, since uint_fast16_t can be 64-bit
+ on 64-bit systems, which is bad for CPU's cache. */
+#define CProb uint32_t
#define LZMA_BASE_SIZE 1846
#define LZMA_LIT_SIZE 768
@@ -121,7 +124,9 @@
Macros
********/
+#ifndef MIN
#define MIN(x,y) ((x) < (y) ? (x) : (y))
+#endif
/**********