notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git subrepo pull (merge) --force deps/libchdr
[pcsx_rearmed.git]
/
deps
/
libchdr
/
deps
/
zstd-1.5.6
/
contrib
/
linux-kernel
/
zstd_deps.h
diff --git
a/deps/libchdr/deps/zstd-1.5.5/contrib/linux-kernel/zstd_deps.h
b/deps/libchdr/deps/zstd-1.5.6/contrib/linux-kernel/zstd_deps.h
similarity index 95%
rename from
deps/libchdr/deps/zstd-1.5.5/contrib/linux-kernel/zstd_deps.h
rename to
deps/libchdr/deps/zstd-1.5.6/contrib/linux-kernel/zstd_deps.h
index
670c5fa
..
f931f7d
100644
(file)
--- a/
deps/libchdr/deps/zstd-1.5.5/contrib/linux-kernel/zstd_deps.h
+++ b/
deps/libchdr/deps/zstd-1.5.6/contrib/linux-kernel/zstd_deps.h
@@
-115,11
+115,7
@@
static uint64_t ZSTD_div64(uint64_t dividend, uint32_t divisor) {
#ifndef ZSTD_DEPS_STDINT
#define ZSTD_DEPS_STDINT
#ifndef ZSTD_DEPS_STDINT
#define ZSTD_DEPS_STDINT
-/*
- * The Linux Kernel doesn't provide intptr_t, only uintptr_t, which
- * is an unsigned long.
- */
-typedef long intptr_t;
+/* intptr_t already provided by ZSTD_DEPS_COMMON */
#endif /* ZSTD_DEPS_STDINT */
#endif /* ZSTD_DEPS_NEED_STDINT */
#endif /* ZSTD_DEPS_STDINT */
#endif /* ZSTD_DEPS_NEED_STDINT */