mirror of
https://github.com/isledecomp/isle.git
synced 2025-10-23 00:14:22 +00:00
Backports of isle-portable x64 fixes (#1044)
* Introduce LPD3DRM_APPDATA typedef for setting d3drm appdata * Fix warning about assigning const string literals to variable char pointers * Don't cast pointers to integers on non-32-bit architectures * memset 2nd argument is int * Assume cpuid is available on x86_64, needs testing on i386 and unavailable on anything else * Store HFILE in its own member variable
This commit is contained in:

committed by
GitHub

parent
62307e1819
commit
8113a17167
@@ -12,8 +12,17 @@ class LegoEntityList;
|
||||
class LegoPathBoundary;
|
||||
class LegoHideAnimPresenter;
|
||||
|
||||
#if defined(_M_IX86) || defined(__i386__)
|
||||
#define COMPARE_POINTER_TYPE MxS32
|
||||
#else
|
||||
#define COMPARE_POINTER_TYPE MxS32*
|
||||
#endif
|
||||
|
||||
struct CoreSetCompare {
|
||||
MxS32 operator()(MxCore* const& p_a, MxCore* const& p_b) const { return (MxS32) p_a < (MxS32) p_b; }
|
||||
MxS32 operator()(MxCore* const& p_a, MxCore* const& p_b) const
|
||||
{
|
||||
return (COMPARE_POINTER_TYPE) p_a < (COMPARE_POINTER_TYPE) p_b;
|
||||
}
|
||||
};
|
||||
|
||||
typedef set<MxCore*, CoreSetCompare> MxCoreSet;
|
||||
|
Reference in New Issue
Block a user