diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-30 03:29:12 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-30 03:29:12 +0200 |
| commit | c05a39147a462d610dabaf89dae59c004e7dd539 (patch) | |
| tree | 10cff4a66c8d9999df7e02648b72b1c7a289ada5 /depends/pack200/src/utils.h | |
| parent | 2173abb9a87c67b53e64c9bdebbba5fa6b4d4b7d (diff) | |
| parent | e45b444242104e557f1bce14e9c11e3792bbe41f (diff) | |
| download | MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar.gz MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar.lz MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar.xz MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.zip | |
Implemented xz and pack200 unpackers required for proper forge installation.
Merge branch 'feature_forge_unpackers' into develop
Conflicts:
CMakeLists.txt
Diffstat (limited to 'depends/pack200/src/utils.h')
| -rw-r--r-- | depends/pack200/src/utils.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/depends/pack200/src/utils.h b/depends/pack200/src/utils.h index 0ce6b7d8..5a3dc8f6 100644 --- a/depends/pack200/src/utils.h +++ b/depends/pack200/src/utils.h @@ -25,6 +25,8 @@ // Definitions of our util functions +#include <stdexcept> + void *must_malloc(size_t size); // overflow management @@ -46,9 +48,6 @@ inline size_t add_size(size_t size1, size_t size2, int size3) return add_size(add_size(size1, size2), size3); } -// These may be expensive, because they have to go via Java TSD, -// if the optional u argument is missing. struct unpacker; -extern void unpack_abort(const char *msg, unpacker *u = nullptr); -extern bool unpack_aborting(unpacker *u = nullptr); - +/// This throws an exception! +extern void unpack_abort(const char *msg = nullptr); |