Skip to content

Commit

Permalink
Merge pull request #2142 from mitza-oci/macos-long-double
Browse files Browse the repository at this point in the history 
macOS: sizeof long double is different on ARM64
(cherry picked from commit 1affc2b)

# Conflicts:
#	ACE/ace/config-macosx-leopard.h
#	ACE/ace/config-macosx-tiger.h
  • Loading branch information
@mitza-oci
mitza-oci committed Oct 6, 2023
1 parent 3a598e5 commit c63f996
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
8 changes: 1 addition & 7 deletions ACE/ace/config-macosx-leopard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,7 @@
#endif /* ! __ACE_INLINE__ */

#if !defined (ACE_SIZEOF_LONG_DOUBLE)
# if (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
// Size of long double in GCC 3.3 is 8.
# define ACE_SIZEOF_LONG_DOUBLE 8
# else // Else, the compiler is GCC4
// For GCC4, the size is 16.
# define ACE_SIZEOF_LONG_DOUBLE 16
# endif // GCC 3.3
# define ACE_SIZEOF_LONG_DOUBLE __SIZEOF_LONG_DOUBLE__
#endif // ACE_SIZEOF_LONG_DOUBLE

#if defined (__GNUG__)
Expand Down
8 changes: 1 addition & 7 deletions ACE/ace/config-macosx-tiger.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,7 @@
#endif /* ! __ACE_INLINE__ */

#if !defined (ACE_SIZEOF_LONG_DOUBLE)
# if (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
// Size of long double in GCC 3.3 is 8.
# define ACE_SIZEOF_LONG_DOUBLE 8
# else // Else, the compiler is GCC4
// For GCC4, the size is 16.
# define ACE_SIZEOF_LONG_DOUBLE 16
# endif // GCC 3.3
# define ACE_SIZEOF_LONG_DOUBLE __SIZEOF_LONG_DOUBLE__
#endif // ACE_SIZEOF_LONG_DOUBLE

#if defined (__GNUG__)
Expand Down

0 comments on commit c63f996

Please sign in to comment.