Skip to content

Commit 9617dc4

Browse files
committed
Merge branch 'develop' into master, release 0.3.1
2 parents 900e4e5 + e80907f commit 9617dc4

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
1818
set(CMAKE_VERBOSE_MAKEFILE ON)
1919
endif()
2020

21+
CHECK_C_COMPILER_FLAG("-std=c11" HAS_C11)
22+
if(HAS_C11)
23+
set(C_FLAGS "-std=c11")
24+
else()
25+
set(C_FLAGS "-std=c99")
26+
endif()
27+
2128
CHECK_CXX_COMPILER_FLAG("-std=c++11" HAS_CXX11)
2229
if(HAS_CXX11)
2330
set(CXX_FLAGS "-std=c++11")

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ They can be used for dumping MessagePack from a file or web API to a human-reada
1212

1313
| [Travis-CI](https://travis-ci.org/) |
1414
| :-------: |
15-
| [![Build Status](https://travis-ci.org/ludocode/msgpack-tools.svg?branch=rapidjson)](https://travis-ci.org/ludocode/msgpack-tools/branches) |
15+
| [![Build Status](https://travis-ci.org/ludocode/msgpack-tools.svg?branch=master)](https://travis-ci.org/ludocode/msgpack-tools/branches) |
1616

1717
## Examples
1818

src/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ extern "C" {
3939
#include "b64/cencode.h"
4040
}
4141

42-
#define VERSION "0.3"
42+
#define VERSION "0.3.1"
4343

4444
#endif

0 commit comments

Comments
 (0)