diff options
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/hoedown/src/buffer.c | 2 | ||||
| -rw-r--r-- | depends/pack200/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | depends/pack200/include/unpack200.h | 3 | ||||
| -rw-r--r-- | depends/pack200/src/bytes.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/depends/hoedown/src/buffer.c b/depends/hoedown/src/buffer.c index 12969c5f..1c7ba55a 100644 --- a/depends/hoedown/src/buffer.c +++ b/depends/hoedown/src/buffer.c @@ -112,7 +112,7 @@ hoedown_buffer_grow(hoedown_buffer *buf, size_t neosz) while (neoasz < neosz) neoasz += buf->unit; - buf->data = buf->data_realloc(buf->data, neoasz); + buf->data = (uint8_t *) buf->data_realloc(buf->data, neoasz); buf->asize = neoasz; } 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; |