procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Version 1.9.3: Fix build for OS X 10.10-10.11.

This commit is contained in:
John Preston 2019-12-31 17:52:15 +03:00
parent 651ef2aa78
commit da7178089f
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/history/view/media/history_view_media.cpp
View File

@ -26,8 +26,10 @@ namespace {
auto ok1 = true; auto ok1 = true;
auto ok2 = true; auto ok2 = true;
auto ok3 = true; auto ok3 = true;
auto minutes = minutes1.toString();
minutes += minutes2;
const auto result = (hours.isEmpty() ? 0 : hours.toInt(&ok1)) * 3600 const auto result = (hours.isEmpty() ? 0 : hours.toInt(&ok1)) * 3600
+ (minutes1 + minutes2).toInt(&ok2) * 60 + minutes.toInt(&ok2) * 60
+ seconds.toInt(&ok3); + seconds.toInt(&ok3);
return (ok1 && ok2 && ok3) ? result : -1; return (ok1 && ok2 && ok3) ? result : -1;
} }

1
Telegram/SourceFiles/mtproto/type_utils.h
View File

@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "scheme.h"
#include "base/flags.h" #include "base/flags.h"
inline MTPbool MTP_bool(bool v) { inline MTPbool MTP_bool(bool v) {

2
Telegram/cmake/lib_tgvoip.cmake
View File

@ -775,10 +775,10 @@ PUBLIC
${tgvoip_loc} ${tgvoip_loc}
PRIVATE PRIVATE
${tgvoip_loc}/webrtc_dsp ${tgvoip_loc}/webrtc_dsp
${libs_loc}/opus/include
) )
target_link_libraries(lib_tgvoip target_link_libraries(lib_tgvoip
PRIVATE PRIVATE
desktop-app::external_openssl desktop-app::external_openssl
desktop-app::external_opus
) )

2
cmake

@ -1 +1 @@
Subproject commit b08c57c8d0de79f7d569c4261a72c1dbeb28d602 Subproject commit 449066752048a9b5e64f8b9bbad7af8b0e53e8b2