Browse Source

Fix macOS x86_64 + arm64 interoperability

tags/v1.9.17
falkTX 4 years ago
parent
commit
94a59faae9
2 changed files with 7 additions and 2 deletions
  1. +2
    -2
      common/jack/systemdeps.h
  2. +5
    -0
      common/shm.h

+ 2
- 2
common/jack/systemdeps.h View File

@@ -124,10 +124,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

#endif /* __APPLE__ || __linux__ || __sun__ || sun */

#if defined(__arm__) || defined(__aarch64__) || defined(__mips__) || defined(__ppc__) || defined(__powerpc__)
#if (defined(__arm__) || defined(__aarch64__) || defined(__mips__) || defined(__ppc__) || defined(__powerpc__)) && !defined(__APPLE__)
#undef POST_PACKED_STRUCTURE
#define POST_PACKED_STRUCTURE
#endif /* __arm__ || __aarch64__ || __ppc__ || __powerpc__ */
#endif /* __arm__ || __aarch64__ || __mips__ || __ppc__ || __powerpc__ */

/** define JACK_LIB_EXPORT, useful for internal clients */
#if defined(_WIN32)


+ 5
- 0
common/shm.h View File

@@ -105,7 +105,12 @@ extern "C"
shm_ANDROID = 4 /* Android shared memory */
} jack_shmtype_t;

#ifdef __APPLE__
/* we need to align and pack data to 32bit so that x86_64 and arm64 work together */
typedef int32_t jack_shm_registry_index_t;
#else
typedef int16_t jack_shm_registry_index_t;
#endif

/**
* A structure holding information about shared memory allocated by


Loading…
Cancel
Save