Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better check for LP64 architectures #591

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Better check for LP64 architectures #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions nuklear.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,10 @@ extern "C" {
#elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
#define NK_SIZE_TYPE unsigned __int32
#elif defined(__GNUC__) || defined(__clang__)
#if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__)
#ifdef __LP64__
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than replacing the compiler checks, could we append it to the OR list instead? For example....

#if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) || defined(__LP64__)

I'd be worried about older infrastructures that define one of the above, but skip __LP64__. Want to keep backward compatibility.

#define NK_SIZE_TYPE unsigned long
#elif defined(_WIN64)
#define NK_SIZE_TYPE unsigned long long
#else
#define NK_SIZE_TYPE unsigned int
#endif
Expand All @@ -388,8 +390,10 @@ extern "C" {
#elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
#define NK_POINTER_TYPE unsigned __int32
#elif defined(__GNUC__) || defined(__clang__)
#if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__)
#ifdef __LP64__
#define NK_POINTER_TYPE unsigned long
#elif defined(_WIN64)
#define NK_POINTER_TYPE unsigned long long
#else
#define NK_POINTER_TYPE unsigned int
#endif
Expand Down
8 changes: 6 additions & 2 deletions src/nuklear.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,10 @@ extern "C" {
#elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
#define NK_SIZE_TYPE unsigned __int32
#elif defined(__GNUC__) || defined(__clang__)
#if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__)
#ifdef __LP64__
#define NK_SIZE_TYPE unsigned long
#elif defined(_WIN64)
#define NK_SIZE_TYPE unsigned long long
#else
#define NK_SIZE_TYPE unsigned int
#endif
Expand All @@ -166,8 +168,10 @@ extern "C" {
#elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
#define NK_POINTER_TYPE unsigned __int32
#elif defined(__GNUC__) || defined(__clang__)
#if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__)
#ifdef __LP64__
#define NK_POINTER_TYPE unsigned long
#elif defined(_WIN64)
#define NK_POINTER_TYPE unsigned long long
#else
#define NK_POINTER_TYPE unsigned int
#endif
Expand Down