diff options
| -rw-r--r-- | .clang-format | 1 | ||||
| -rw-r--r-- | .travis.yml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.clang-format b/.clang-format index 1d84013..6e49d83 100644 --- a/.clang-format +++ b/.clang-format @@ -8,3 +8,4 @@ IndentWidth: 4 PointerBindsToType: false ColumnLimit: 0 SpaceBeforeParens: ControlStatements +SortIncludes: false diff --git a/.travis.yml b/.travis.yml index 71bc279..05d1703 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,9 @@ addons: # xmlto pulls in a2x which we need for generating manpages from asciidoc. - xmlto - libcap2-bin - - clang-format-3.5 + - clang-format-3.8 - libllvm3.5 script: - make -j - - clang-format-3.5 -i $(find . -name "*.[ch]" | tr '\n' ' ') && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false) + - clang-format-3.8 -i $(find . -name "*.[ch]" | tr '\n' ' ') && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false) - make test |