diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-05-25 15:33:33 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-05-25 15:33:33 +0100 |
| commit | 54d43010c808b56caa703696a036df18d2b74575 (patch) | |
| tree | 61cbc677c61e050a41669f858388a6d6cc7d732e /src | |
| parent | 024685f3db2be6c4cfb55670ecc92d8d1a0c9a8d (diff) | |
| parent | 8d55954ce13b9f93cc220bcbaab56fb236d16c9c (diff) | |
Merge branch 'rav/jenkins_build'
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs.c (renamed from src/libs.cpp) | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libs.cpp b/src/libs.c index 6757574..4304354 100644 --- a/src/libs.cpp +++ b/src/libs.c @@ -1,4 +1,4 @@ -/* Copyright 2015 OpenMarket Ltd +/* Copyright 2015-6 OpenMarket Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -extern "C" { #include "crypto-algorithms/sha256.c" #include "crypto-algorithms/aes.c" #include "curve25519-donna/curve25519-donna.c" @@ -24,4 +23,3 @@ extern "C" { #include "ed25519/src/verify.c" #include "ed25519/src/sign.c" #include "ed25519_additions.c" -} |