From 7edb835efc20ca91d2917c9abbdb7e8a5989f6a9 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 19 Apr 2016 11:57:55 +0300 Subject: [PATCH] Removed openssl patch. Xcode warning fixed. --- Telegram/SourceFiles/intro/introwidget.h | 2 +- Telegram/_openssl_patch.diff | 13 ------------- doc/building-msvc.md | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 Telegram/_openssl_patch.diff diff --git a/Telegram/SourceFiles/intro/introwidget.h b/Telegram/SourceFiles/intro/introwidget.h index 6c377f800..c569e2a3c 100644 --- a/Telegram/SourceFiles/intro/introwidget.h +++ b/Telegram/SourceFiles/intro/introwidget.h @@ -74,7 +74,7 @@ public: void finish(const MTPUser &user, const QImage &photo = QImage()); - void rpcClear(); + void rpcClear() override; void langChangeTo(int32 langId); void nextStep(IntroStep *step) { diff --git a/Telegram/_openssl_patch.diff b/Telegram/_openssl_patch.diff deleted file mode 100644 index 51df18a67..000000000 --- a/Telegram/_openssl_patch.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/e_os.h b/e_os.h -index 7584485..0b37c94 100644 ---- a/e_os.h -+++ b/e_os.h -@@ -315,7 +315,7 @@ static __inline unsigned int _strlen31(const char *str) - # undef isxdigit - # endif - # if defined(_MSC_VER) && !defined(_DLL) && defined(stdin) --# if _MSC_VER>=1300 -+# if (_MSC_VER>=1300) && (_MSC_VER<=1800) - # undef stdin - # undef stdout - # undef stderr diff --git a/doc/building-msvc.md b/doc/building-msvc.md index a0f1140f0..ca26324f8 100644 --- a/doc/building-msvc.md +++ b/doc/building-msvc.md @@ -21,7 +21,6 @@ Open **VS2015 x86 Native Tools Command Prompt.bat** (should be in **Start Menu > git clone https://github.com/openssl/openssl.git cd openssl git checkout OpenSSL_1_0_1-stable - git apply ./../../tdesktop/Telegram/_openssl_patch.diff perl Configure VC-WIN32 --prefix=D:\TBuild\Libraries\openssl\Release ms\do_ms nmake -f ms\nt.mak @@ -30,7 +29,6 @@ Open **VS2015 x86 Native Tools Command Prompt.bat** (should be in **Start Menu > git clone https://github.com/openssl/openssl.git openssl_debug cd openssl_debug git checkout OpenSSL_1_0_1-stable - git apply ./../../tdesktop/Telegram/_openssl_patch.diff perl Configure debug-VC-WIN32 --prefix=D:\TBuild\Libraries\openssl_debug\Debug ms\do_ms nmake -f ms\nt.mak