commit 868eb66a

sago007 · 2017-07-10 22:36
868eb66a071be973d0a88cecf03737258e0e6378 patch · browse files
parent 40ba01e014aff0870b0dc87a15704a8d2ad84fcd

Applied patch from Debian
Description: use BUFSIZ as buffer size
Author: Jakub Wilk <jwilk@debian.org>
Bug: http://sourceforge.net/tracker/?func=detail&atid=785907&aid=3591336&group_id=152942
Forwarded: no
Last-Update: 2012-11-30

Changed files

M	CMakeLists.txt before
M	src/Libs/include/b64/decode.h before
M	src/Libs/include/b64/encode.h before

diff --git a/CMakeLists.txt b/CMakeLists.txt index c8c5db3..226efcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -5,9 +5,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${saland_SOURCE_DIR}/src/cmake")

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11 -g")

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -g")

-#The following is used by libb64.

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBUFFERSIZE=16777216")

find_package(Boost COMPONENTS program_options REQUIRED)

#Setup SDL2

diff --git a/src/Libs/include/b64/decode.h b/src/Libs/include/b64/decode.h index 12b16ea..e9019f3 100644 --- a/src/Libs/include/b64/decode.h +++ b/src/Libs/include/b64/decode.h

@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64

#ifndef BASE64_DECODE_H

#define BASE64_DECODE_H

+#include <cstdio>

#include <iostream>

namespace base64

@@ -22,7 +23,7 @@ namespace base64

base64_decodestate _state;

int _buffersize;

- decoder(int buffersize_in = BUFFERSIZE)

+ decoder(int buffersize_in = BUFSIZ)

: _buffersize(buffersize_in)

{}

diff --git a/src/Libs/include/b64/encode.h b/src/Libs/include/b64/encode.h index 5d807d9..e7a7035 100644 --- a/src/Libs/include/b64/encode.h +++ b/src/Libs/include/b64/encode.h

@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64

#ifndef BASE64_ENCODE_H

#define BASE64_ENCODE_H

+#include <cstdio>

#include <iostream>

namespace base64

@@ -22,7 +23,7 @@ namespace base64

base64_encodestate _state;

int _buffersize;

- encoder(int buffersize_in = BUFFERSIZE)

+ encoder(int buffersize_in = BUFSIZ)

: _buffersize(buffersize_in)

{}