From bf468f36eaa6d9120a28f2cd62b9b2a0e1aca7c4 Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus@madfire.net>
Date: Sun, 3 Dec 2017 19:30:56 +0200
Subject: [PATCH] Qualify minizip include paths
---
Telegram/CMakeLists.txt | 2 +-
Telegram/SourceFiles/base/zlib_help.h | 4 ++--
Telegram/ThirdParty/minizip/unzip.c | 2 +-
Telegram/ThirdParty/minizip/zip.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 651276415..a90315e05 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -537,8 +537,8 @@ list(APPEND THIRD_PARTY_SRC
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
ThirdParty/emoji_suggestions ThirdParty/libtgvoip)
diff --git a/Telegram/SourceFiles/base/zlib_help.h b/Telegram/SourceFiles/base/zlib_help.h
index 1aad0ea46..682cbc83d 100644
--- a/Telegram/SourceFiles/base/zlib_help.h
+++ b/Telegram/SourceFiles/base/zlib_help.h
@@ -23,8 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
*/
#pragma once
-#include "zip.h"
-#include "unzip.h"
+#include "minizip/zip.h"
+#include "minizip/unzip.h"
namespace zlib {
namespace internal {
diff --git a/Telegram/ThirdParty/minizip/unzip.c b/Telegram/ThirdParty/minizip/unzip.c
index 909350435..801c00cad 100644
--- a/Telegram/ThirdParty/minizip/unzip.c
+++ b/Telegram/ThirdParty/minizip/unzip.c
@@ -73,7 +73,7 @@
#endif
#include "zlib.h"
-#include "unzip.h"
+#include "minizip/unzip.h"
#ifdef STDC
# include <stddef.h>
diff --git a/Telegram/ThirdParty/minizip/zip.c b/Telegram/ThirdParty/minizip/zip.c
index d1a31dd28..33f3c0f95 100644
--- a/Telegram/ThirdParty/minizip/zip.c
+++ b/Telegram/ThirdParty/minizip/zip.c
@@ -27,7 +27,7 @@
#include <string.h>
#include <time.h>
#include "zlib.h"
-#include "zip.h"
+#include "minizip/zip.h"
#ifdef STDC
# include <stddef.h>