diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-05-27 10:50:31 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-27 10:50:31 -0700 |
| commit | ed784fd1698ddd4ef4b23160b4f8a5cca4462537 (patch) | |
| tree | ade80c2fa4f78912d93e47ca157a206fd1bc2889 /vp8 | |
| parent | e767cdeda31a49f19cb84f38cb7984e85226363b (diff) | |
| parent | 1f0b2f95afd96a5df6ff620fc0b838da98319b9b (diff) | |
| download | libvpx-ed784fd1698ddd4ef4b23160b4f8a5cca4462537.tar libvpx-ed784fd1698ddd4ef4b23160b4f8a5cca4462537.tar.gz libvpx-ed784fd1698ddd4ef4b23160b4f8a5cca4462537.tar.bz2 libvpx-ed784fd1698ddd4ef4b23160b4f8a5cca4462537.zip | |
Merge "Removing vp8/common/pragmas.h."
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/pragmas.h | 29 | ||||
| -rw-r--r-- | vp8/common/x86/variance_mmx.c | 1 | ||||
| -rw-r--r-- | vp8/common/x86/variance_sse2.c | 1 | ||||
| -rw-r--r-- | vp8/common/x86/variance_ssse3.c | 1 | ||||
| -rw-r--r-- | vp8/encoder/bitstream.c | 1 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 1 | ||||
| -rw-r--r-- | vp8/vp8_common.mk | 1 |
7 files changed, 0 insertions, 35 deletions
diff --git a/vp8/common/pragmas.h b/vp8/common/pragmas.h deleted file mode 100644 index 329cc8275..000000000 --- a/vp8/common/pragmas.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE 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. - */ - -#ifndef VP8_COMMON_PRAGMAS_H_ -#define VP8_COMMON_PRAGMAS_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __INTEL_COMPILER -#pragma warning(disable:997 1011 170) -#endif -#ifdef _MSC_VER -#pragma warning(disable:4799) -#endif - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // VP8_COMMON_PRAGMAS_H_ diff --git a/vp8/common/x86/variance_mmx.c b/vp8/common/x86/variance_mmx.c index 36995db9a..02e02420f 100644 --- a/vp8/common/x86/variance_mmx.c +++ b/vp8/common/x86/variance_mmx.c @@ -10,7 +10,6 @@ #include "vpx_config.h" #include "vp8/common/variance.h" -#include "vp8/common/pragmas.h" #include "vpx_ports/mem.h" #include "vp8/common/x86/filter_x86.h" diff --git a/vp8/common/x86/variance_sse2.c b/vp8/common/x86/variance_sse2.c index 7fa5f53dc..1fe127bf2 100644 --- a/vp8/common/x86/variance_sse2.c +++ b/vp8/common/x86/variance_sse2.c @@ -10,7 +10,6 @@ #include "vpx_config.h" #include "vp8/common/variance.h" -#include "vp8/common/pragmas.h" #include "vpx_ports/mem.h" #include "vp8/common/x86/filter_x86.h" diff --git a/vp8/common/x86/variance_ssse3.c b/vp8/common/x86/variance_ssse3.c index f90f8117c..73eb90df6 100644 --- a/vp8/common/x86/variance_ssse3.c +++ b/vp8/common/x86/variance_ssse3.c @@ -10,7 +10,6 @@ #include "vpx_config.h" #include "vp8/common/variance.h" -#include "vp8/common/pragmas.h" #include "vpx_ports/mem.h" extern unsigned int vp8_get16x16var_sse2 diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index 78e54e248..9d0e69cf4 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -18,7 +18,6 @@ #include <assert.h> #include <stdio.h> #include <limits.h> -#include "vp8/common/pragmas.h" #include "vpx/vpx_encoder.h" #include "vpx_mem/vpx_mem.h" #include "bitstream.h" diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 387701c57..d9f39b507 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -15,7 +15,6 @@ #include <assert.h> #include "vpx_config.h" #include "vp8_rtcd.h" -#include "vp8/common/pragmas.h" #include "tokenize.h" #include "treewriter.h" #include "onyx_int.h" diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index 9eb308985..0b1ac9eeb 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -9,7 +9,6 @@ ## VP8_COMMON_SRCS-yes += vp8_common.mk -VP8_COMMON_SRCS-yes += common/pragmas.h VP8_COMMON_SRCS-yes += common/ppflags.h VP8_COMMON_SRCS-yes += common/onyx.h VP8_COMMON_SRCS-yes += common/onyxd.h |