From 62bb7144213b8a5d35a41a353486d9d40e2f64b5 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 28 Jan 2018 21:13:25 +0300 Subject: [PATCH] Fix some includes and spelling. GitOrigin-RevId: 489a75315987be488d8caf63a9d3c4f0948ab810 --- example/java/README.md | 8 ++++---- example/java/td_jni.cpp | 1 + td/generate/generate_common.cpp | 1 - td/telegram/DeviceTokenManager.cpp | 1 + td/telegram/Log.cpp | 1 + tdutils/td/utils/base64.cpp | 1 + tdutils/td/utils/port/CxCli.h | 1 + 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/example/java/README.md b/example/java/README.md index c8ece7c9f..0ef261502 100644 --- a/example/java/README.md +++ b/example/java/README.md @@ -5,7 +5,7 @@ For Javadoc documentation generation PHP is needed. TDLib should be prebuilt for using with Java and installed to local subdirectory `td/`: ``` -cd +cd mkdir jnibuild cd jnibuild cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=../example/java/td .. @@ -15,10 +15,10 @@ If you want to compile TDLib for 64-bit Java on Windows, you will also need to a Then you can build this example: ``` -cd /example/java +cd /example/java mkdir build cd build -cmake -DCMAKE_BUILD_TYPE=Release -DTd_DIR=/example/java/td/lib/cmake/Td -DCMAKE_INSTALL_PREFIX:PATH=.. .. +cmake -DCMAKE_BUILD_TYPE=Release -DTd_DIR=/example/java/td/lib/cmake/Td -DCMAKE_INSTALL_PREFIX:PATH=.. .. cmake --build . --target install ``` @@ -26,7 +26,7 @@ Compiled TDLib shared library and Java example after that will be placed in bin/ Now you can run Java example: ``` -cd /example/java/bin +cd /example/java/bin java -Djava.library.path=. org/drinkless/tdlib/example/Example ``` diff --git a/example/java/td_jni.cpp b/example/java/td_jni.cpp index 18c9b424d..2638f592f 100644 --- a/example/java/td_jni.cpp +++ b/example/java/td_jni.cpp @@ -6,6 +6,7 @@ // #include #include +#include #include diff --git a/td/generate/generate_common.cpp b/td/generate/generate_common.cpp index 84c148a53..8759c4055 100644 --- a/td/generate/generate_common.cpp +++ b/td/generate/generate_common.cpp @@ -13,7 +13,6 @@ #include "td/tl/tl_config.h" #include "td/tl/tl_generate.h" -#include #include #include diff --git a/td/telegram/DeviceTokenManager.cpp b/td/telegram/DeviceTokenManager.cpp index a08870598..9cc9d5902 100644 --- a/td/telegram/DeviceTokenManager.cpp +++ b/td/telegram/DeviceTokenManager.cpp @@ -18,6 +18,7 @@ #include "td/utils/format.h" #include "td/utils/JsonBuilder.h" #include "td/utils/logging.h" +#include "td/utils/Slice.h" #include "td/utils/Status.h" #include "td/utils/tl_helpers.h" diff --git a/td/telegram/Log.cpp b/td/telegram/Log.cpp index 143385fc5..2c1b6dde6 100644 --- a/td/telegram/Log.cpp +++ b/td/telegram/Log.cpp @@ -9,6 +9,7 @@ #include "td/utils/common.h" #include "td/utils/FileLog.h" #include "td/utils/logging.h" +#include "td/utils/Slice.h" #include diff --git a/tdutils/td/utils/base64.cpp b/tdutils/td/utils/base64.cpp index 38e583291..89454bee6 100644 --- a/tdutils/td/utils/base64.cpp +++ b/tdutils/td/utils/base64.cpp @@ -7,6 +7,7 @@ #include "td/utils/base64.h" #include "td/utils/common.h" +#include "td/utils/logging.h" #include "td/utils/Slice.h" #include "td/utils/Status.h" diff --git a/tdutils/td/utils/port/CxCli.h b/tdutils/td/utils/port/CxCli.h index 00393b097..2d02838f7 100644 --- a/tdutils/td/utils/port/CxCli.h +++ b/tdutils/td/utils/port/CxCli.h @@ -16,6 +16,7 @@ #include "collection.h" +#include #include #include