summaryrefslogtreecommitdiffstats
path: root/depends/pack200
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-10-11 19:56:31 +0200
committerPetr Mrázek <peterix@gmail.com>2015-10-11 19:56:31 +0200
commit457dd2e94e3c1e6cf51b7cbe264927b213d1085c (patch)
treed603f16f1fbe61504747ce972e1b3c8f005328d1 /depends/pack200
parent44db72ead568fe7ce22e1999aac02fd9aac9beea (diff)
downloadMultiMC-457dd2e94e3c1e6cf51b7cbe264927b213d1085c.tar
MultiMC-457dd2e94e3c1e6cf51b7cbe264927b213d1085c.tar.gz
MultiMC-457dd2e94e3c1e6cf51b7cbe264927b213d1085c.tar.lz
MultiMC-457dd2e94e3c1e6cf51b7cbe264927b213d1085c.tar.xz
MultiMC-457dd2e94e3c1e6cf51b7cbe264927b213d1085c.zip
NOISSUE make the compiler more evil
Diffstat (limited to 'depends/pack200')
-rw-r--r--depends/pack200/CMakeLists.txt4
-rw-r--r--depends/pack200/include/unpack200.h3
-rw-r--r--depends/pack200/src/bytes.h2
3 files changed, 4 insertions, 5 deletions
diff --git a/depends/pack200/CMakeLists.txt b/depends/pack200/CMakeLists.txt
index 19a7643c..b060905b 100644
--- a/depends/pack200/CMakeLists.txt
+++ b/depends/pack200/CMakeLists.txt
@@ -29,9 +29,7 @@ set(PACK200_SRC
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
add_library(unpack200 STATIC ${PACK200_SRC})
-target_include_directories(unpack200
- PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
- PRIVATE ${ZLIB_INCLUDE_DIRS})
+target_include_directories(unpack200 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" PRIVATE ${ZLIB_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/src")
target_link_libraries(unpack200 ${ZLIB_LIBRARIES})
diff --git a/depends/pack200/include/unpack200.h b/depends/pack200/include/unpack200.h
index f9239488..9c3eda2d 100644
--- a/depends/pack200/include/unpack200.h
+++ b/depends/pack200/include/unpack200.h
@@ -31,7 +31,6 @@
*
* @param input_path Path to the input file in PACK200 format. System native string encoding.
* @param output_path Path to the output file in PACK200 format. System native string encoding.
- * @return void
* @throw std::runtime_error for any error encountered
*/
-void unpack_200(FILE * input, FILE * output);
+void unpack_200(FILE * input_path, FILE * output_path);
diff --git a/depends/pack200/src/bytes.h b/depends/pack200/src/bytes.h
index 6ed0b729..b116efda 100644
--- a/depends/pack200/src/bytes.h
+++ b/depends/pack200/src/bytes.h
@@ -23,6 +23,8 @@
* questions.
*/
+#pragma once
+
struct bytes
{
int8_t *ptr;