From 5f1cd555cd9d1c64426e173b30b5b792d211c835 Mon Sep 17 00:00:00 2001 From: Quentin Bazin Date: Wed, 28 Nov 2018 20:01:49 +0100 Subject: Move client-specific files to 'src/client' (#7902) Update Android.mk Remove 'src/client' from include_directories --- src/script/cpp_api/s_base.cpp | 2 +- src/script/cpp_api/s_client.cpp | 2 +- src/script/cpp_api/s_security.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/script/cpp_api') diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp index d98359d20..bf89f748c 100644 --- a/src/script/cpp_api/s_base.cpp +++ b/src/script/cpp_api/s_base.cpp @@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/string.h" #include "server.h" #ifndef SERVER -#include "client.h" +#include "client/client.h" #endif diff --git a/src/script/cpp_api/s_client.cpp b/src/script/cpp_api/s_client.cpp index 597883c2f..f2cc9730b 100644 --- a/src/script/cpp_api/s_client.cpp +++ b/src/script/cpp_api/s_client.cpp @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "s_client.h" #include "s_internal.h" -#include "client.h" +#include "client/client.h" #include "common/c_converter.h" #include "common/c_content.h" #include "s_item.h" diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp index e87f16ddd..e9067a54c 100644 --- a/src/script/cpp_api/s_security.cpp +++ b/src/script/cpp_api/s_security.cpp @@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "filesys.h" #include "porting.h" #include "server.h" -#include "client.h" +#include "client/client.h" #include "settings.h" #include -- cgit v1.2.3