Skip to content

Commit 1ffb514

Browse files
committed
Compilation Fix #199 Use Architecture-independent macros to adjust to 64 ot 32 bits platform
1 parent 8253e0e commit 1ffb514

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

ext/OSCPack/osc/OscReceivedElements.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,6 @@ class ReceivedPacket{
100100
: contents_( contents )
101101
, size_( ValidateSize( (osc_bundle_element_size_t)size ) ) {}
102102

103-
#if !(defined(__x86_64__) || defined(_M_X64))
104-
ReceivedPacket( const char *contents, int size )
105-
: contents_( contents )
106-
, size_( ValidateSize( (osc_bundle_element_size_t)size ) ) {}
107-
#endif
108103

109104
bool IsMessage() const { return !IsBundle(); }
110105
bool IsBundle() const;

ext/OSCPack/osc/OscTypes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace osc{
4747
typedef __int64 int64;
4848
typedef unsigned __int64 uint64;
4949

50-
#elif defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64)
50+
#elif defined(__LP64__) || defined(_LP64) || defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 8
5151

5252
typedef long int64;
5353
typedef unsigned long uint64;
@@ -61,7 +61,7 @@ typedef unsigned long long uint64;
6161

6262

6363

64-
#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64)
64+
#if defined(__LP64__) || defined(_LP64) || defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 8
6565

6666
typedef signed int int32;
6767
typedef unsigned int uint32;

0 commit comments

Comments
 (0)