From 0442af7920104d19df43c2b133c3078c22ae57f3 Mon Sep 17 00:00:00 2001 From: mittorn Date: Sat, 16 Dec 2023 22:45:52 +0300 Subject: [PATCH] platform/android_nosdl/dlsym-weak: move includes/defines to the beginning --- engine/platform/android/dlsym-weak.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/engine/platform/android/dlsym-weak.cpp b/engine/platform/android/dlsym-weak.cpp index 0268b9f1..8f78bf64 100644 --- a/engine/platform/android/dlsym-weak.cpp +++ b/engine/platform/android/dlsym-weak.cpp @@ -25,12 +25,15 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - -#if defined __ANDROID__ && !defined XASH_64BIT +#include "build.h" +#if !XASH_64BIT #include #include #include #include "linker.h" +extern "C" { +#include "lib_android.h" +} static Elf_Sym* soinfo_elf_lookup( soinfo* si, unsigned hash, const char* name ) { @@ -118,8 +121,6 @@ static Elf_Sym* dlsym_handle_lookup( soinfo* si, const char* name ) { return soinfo_elf_lookup( si, elfhash( name ), name ); } -#define XASH_ANDROID 1 -#include "lib_android.h" static int dladdr_fallback( const void *addr, Dl_info *info ) {