1 files changed, 0 insertions, 49 deletions
diff --git a/extern/libmv/patches/clang-3.diff b/extern/libmv/patches/clang-3.diff
deleted file mode 100644
index 9e73490827d..00000000000
--- a/extern/libmv/patches/clang-3.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: third_party/glog/src/utilities.h
-===================================================================
---- third_party/glog/src/utilities.h	(revision 44501)
-+++ third_party/glog/src/utilities.h	(working copy)
-@@ -105,7 +105,7 @@
- # undef STACKTRACE_H
- #elif defined(HAVE_LIB_UNWIND)
- # define STACKTRACE_H "stacktrace_libunwind-inl.h"
--#elif !defined(NO_FRAME_POINTER)
-+#elif !defined(NO_FRAME_POINTER) && !defined(__clang__)
- # if defined(__i386__) && __GNUC__ >= 2
- #  define STACKTRACE_H "stacktrace_x86-inl.h"
- # elif defined(__x86_64__) && __GNUC__ >= 2
-Index: third_party/glog/src/logging.cc
-===================================================================
---- third_party/glog/src/logging.cc	(revision 44501)
-+++ third_party/glog/src/logging.cc	(working copy)
-@@ -1231,6 +1231,14 @@
- #endif
- }
- 
-+#if defined(HAVE___ATTRIBUTE__)
-+typedef void (*fail_func_t)() __attribute__((noreturn));
-+static void logging_fail() __attribute__((noreturn));
-+#else
-+typedef void (*fail_func_t)();
-+static void logging_fail();
-+#endif
-+
- static void logging_fail() {
- // #if defined(_DEBUG) && defined(_MSC_VER)
- // doesn't work for my laptop (sergey)
-@@ -1243,14 +1251,9 @@
- #endif
- }
- 
--#ifdef HAVE___ATTRIBUTE__
--GOOGLE_GLOG_DLL_DECL
--void (*g_logging_fail_func)() __attribute__((noreturn)) = &logging_fail;
--#else
--GOOGLE_GLOG_DLL_DECL void (*g_logging_fail_func)() = &logging_fail;
--#endif
-+GOOGLE_GLOG_DLL_DECL fail_func_t g_logging_fail_func = &logging_fail;
- 
--void InstallFailureFunction(void (*fail_func)()) {
-+void InstallFailureFunction(fail_func_t fail_func) {
-   g_logging_fail_func = fail_func;
- }
-