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

Qualify minizip include paths

This commit is contained in:
Berkus Decker 2017-12-03 19:30:56 +02:00 committed by Berkus Decker
parent d2c6b4041a
commit bf468f36ea
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/CMakeLists.txt
View File

@ -537,8 +537,8 @@ list(APPEND THIRD_PARTY_SRC
ThirdParty/emoji_suggestions/emoji_suggestions.cpp ThirdParty/emoji_suggestions/emoji_suggestions.cpp
) )
include_directories(ThirdParty/minizip)
include_directories(ThirdParty) # For minizip/ but we use fully-qualified include path to avoid ambiguity
include_directories(ThirdParty/GSL/include ThirdParty/variant/include include_directories(ThirdParty/GSL/include ThirdParty/variant/include
ThirdParty/emoji_suggestions ThirdParty/libtgvoip) ThirdParty/emoji_suggestions ThirdParty/libtgvoip)

4
Telegram/SourceFiles/base/zlib_help.h
View File

@ -23,8 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
*/ */
#pragma once #pragma once
#include "zip.h" #include "minizip/zip.h"
#include "unzip.h" #include "minizip/unzip.h"
namespace zlib { namespace zlib {
namespace internal { namespace internal {

2
Telegram/ThirdParty/minizip/unzip.c vendored
View File

@ -73,7 +73,7 @@
#endif #endif
#include "zlib.h" #include "zlib.h"
#include "unzip.h" #include "minizip/unzip.h"
#ifdef STDC #ifdef STDC
# include <stddef.h> # include <stddef.h>

2
Telegram/ThirdParty/minizip/zip.c vendored
View File

@ -27,7 +27,7 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include "zlib.h" #include "zlib.h"
#include "zip.h" #include "minizip/zip.h"
#ifdef STDC #ifdef STDC
# include <stddef.h> # include <stddef.h>