teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Server] Use __genffi__ predefined macro

Browse source 
Fix aarch64 RetType size
This commit is contained in:
Koncord 2019-01-23 15:27:31 +08:00
parent eee9fc1ad1
commit 042a7fa51b
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw-mp/Script/CTypes.h
View file

@ -12,7 +12,7 @@ typedef unsigned __int64 RetType;
#else #else
typedef unsigned long long RetType; typedef unsigned long long RetType;
#endif #endif
#elif defined __x86_64__ && defined __ILP32__ #elif (defined __x86_64__ || defined __aarch64__) && defined __ILP32__
typedef unsigned long long RetType; typedef unsigned long long RetType;
#else #else
typedef unsigned long RetType; typedef unsigned long RetType;
@ -23,6 +23,6 @@ typedef unsigned int PlayerId;
#define InvalidPID ((unsigned int) -1) #define InvalidPID ((unsigned int) -1)
#if !defined __cplusplus #if !(defined __cplusplus || defined __genffi__)
typedef uint8_t bool; typedef uint8_t bool;
#endif #endif

6
apps/openmw-mp/Script/Platform.h
View file

@ -17,7 +17,7 @@
#endif #endif
#endif #endif
#if defined _WIN32 && !defined _LUAJIT_PREPROCESS #if defined _WIN32 && !defined __genffi__
#ifndef CDECL #ifndef CDECL
#define CDECL __cdecl #define CDECL __cdecl
#endif #endif
@ -39,13 +39,13 @@
#define IMPORT_FUNCTION EXTERN #define IMPORT_FUNCTION EXTERN
#endif #endif
#if defined _LUAJIT_PREPROCESS #if defined __genffi__
#define API_FUNCTION #define API_FUNCTION
#elif !defined _HOST #elif !defined _HOST
#define API_FUNCTION IMPORT_FUNCTION #define API_FUNCTION IMPORT_FUNCTION
#else #else
#define API_FUNCTION EXPORT_FUNCTION #define API_FUNCTION EXPORT_FUNCTION
#endif // _LUAJIT_PREPROCESS #endif // __genffi__
#if defined __cplusplus #if defined __cplusplus
#define NAMESPACE_BEGIN(name) namespace name { #define NAMESPACE_BEGIN(name) namespace name {

2
apps/openmw-mp/Script/api.h
View file

@ -15,7 +15,7 @@
#include "CTypes.h" #include "CTypes.h"
#if !(defined _HOST || defined _LUAJIT_PREPROCESS) #if !(defined _HOST || defined __genffi__)
/** @addtogroup PluginCallbacks Plugin Callbacks /** @addtogroup PluginCallbacks Plugin Callbacks
* @brief Those callbacks can be implemented by plugin. * @brief Those callbacks can be implemented by plugin.