diff options
| author | bwzuk <ben.potton@gmail.com> | 2014-02-11 12:53:33 +0000 |
|---|---|---|
| committer | bwzuk <ben.potton@gmail.com> | 2014-02-11 12:53:33 +0000 |
| commit | ef80fffd197e2d03b7bddd3f8da1272452357c6c (patch) | |
| tree | 58bf7a95a580b6705c92cc1d35418d9aa262dfb8 /drivers/webp/dsp/cpu.c | |
| parent | 5a65a6cb2b9134fbdd6e39fe3106b7a90df0cb1b (diff) | |
| parent | abb985e755ccf858149294868eff8a9a9feca67e (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'drivers/webp/dsp/cpu.c')
| -rw-r--r-- | drivers/webp/dsp/cpu.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/webp/dsp/cpu.c b/drivers/webp/dsp/cpu.c index 7a1f417a55..0228734457 100644 --- a/drivers/webp/dsp/cpu.c +++ b/drivers/webp/dsp/cpu.c @@ -1,10 +1,8 @@ // Copyright 2011 Google Inc. All Rights Reserved. // -// Use of this source code is governed by a BSD-style license -// that can be found in the COPYING file in the root of the source -// tree. An additional intellectual property rights grant can be found -// in the file PATENTS. All contributing project authors may -// be found in the AUTHORS file in the root of the source tree. +// This code is licensed under the same terms as WebM: +// Software License Agreement: http://www.webmproject.org/license/software/ +// Additional IP Rights Grant: http://www.webmproject.org/license/additional/ // ----------------------------------------------------------------------------- // // CPU detection @@ -17,6 +15,10 @@ #include <cpu-features.h> #endif +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + //------------------------------------------------------------------------------ // SSE2 detection. // @@ -78,3 +80,6 @@ VP8CPUInfo VP8GetCPUInfo = armCPUInfo; VP8CPUInfo VP8GetCPUInfo = NULL; #endif +#if defined(__cplusplus) || defined(c_plusplus) +} // extern "C" +#endif |