diff options
| author | Greg Hudson <ghudson@mit.edu> | 2020-09-01 00:33:42 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2020-09-02 17:54:25 -0400 |
| commit | d177b5d70bf575c498bfdd3abb6a6413646ad7c5 (patch) | |
| tree | 909b89398e9a2daeadb1b0509e6bc8f5dbd6c372 /src/lib/gssapi | |
| parent | aa07b84341566def14a48a1487cd29c9627a915e (diff) | |
| download | krb5-d177b5d70bf575c498bfdd3abb6a6413646ad7c5.zip krb5-d177b5d70bf575c498bfdd3abb6a6413646ad7c5.tar.gz krb5-d177b5d70bf575c498bfdd3abb6a6413646ad7c5.tar.bz2 | |
Harmonize macOS pack declarations with Heimdal
Replace the TARGET_OS_MAC conditionals with the conditionals used in
Heimdal, so that we do not pack structures inconsistently with macOS
on ARM. Suggested by Luke Howard.
ticket: 8944 (new)
Diffstat (limited to 'src/lib/gssapi')
| -rw-r--r-- | src/lib/gssapi/generic/gssapi.hin | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin index 5049fbd..767fb07 100644 --- a/src/lib/gssapi/generic/gssapi.hin +++ b/src/lib/gssapi/generic/gssapi.hin @@ -39,8 +39,8 @@ extern "C" { #endif /* __cplusplus */ -#if defined(TARGET_OS_MAC) && TARGET_OS_MAC -# pragma pack(push,2) +#if defined(__APPLE__) && (defined(__ppc__) || defined(__ppc64__) || defined(__i386__) || defined(__x86_64__)) +#pragma pack(push,2) #endif #if defined(_MSDOS) || defined(_WIN32) @@ -816,8 +816,8 @@ gss_set_neg_mechs( gss_cred_id_t, /* cred_handle */ const gss_OID_set); /* mech_set */ -#if defined(TARGET_OS_MAC) && TARGET_OS_MAC -# pragma pack(pop) +#if defined(__APPLE__) && (defined(__ppc__) || defined(__ppc64__) || defined(__i386__) || defined(__x86_64__)) +#pragma pack(pop) #endif #ifdef __cplusplus |