Skip to content

bpo-46670: Test if a macro is defined, not its value#31178

Merged
vstinner merged 2 commits intopython:mainfrom
vstinner:pytime_apple
Feb 7, 2022
Merged

bpo-46670: Test if a macro is defined, not its value#31178
vstinner merged 2 commits intopython:mainfrom
vstinner:pytime_apple

Conversation

@vstinner
Copy link
Copy Markdown
Member

@vstinner vstinner commented Feb 7, 2022 •
edited
Loading

  • audioop.c: #ifdef WORDS_BIGENDIAN
  • ctypes.h: #ifdef USING_MALLOC_CLOSURE_DOT_C
  • pytime.c: #ifdef APPLE
  • unicodeobject.c: #ifdef HAVE_NON_UNICODE_WCHAR_T_REPRESENTATION

https://bugs.python.org/issue46670

@vstinner
bpo-46670: Test if a macro is defined, not its value
31c55e8 
* audioop.c: #ifdef WORDS_BIGENDIAN
* ctypes.h: #ifdef USING_MALLOC_CLOSURE_DOT_C
* pytime.c: #ifdef __APPLE__
* unicodeobject.c: #ifdef HAVE_NON_UNICODE_WCHAR_T_REPRESENTATION
@vstinner vstinner changed the title bpo-46670: Fix #ifdef __APPLE__ in pytime.c bpo-46670: Test if a macro is defined, not its value Feb 7, 2022
@vstinner
Copy link
Copy Markdown
Member Author

vstinner commented Feb 7, 2022

Origin of these macros:

setup.py:1767:   extra_compile_args.append('-DUSING_MALLOC_CLOSURE_DOT_C=1')
setup.py:1804:   ext.extra_compile_args.append("-DUSING_APPLE_OS_LIBFFI=1")

pyconfig.h.in:

/* Define if the internal form of wchar_t in non-Unicode locales is not
   Unicode. */
#undef HAVE_NON_UNICODE_WCHAR_T_REPRESENTATION

/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
   significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
#  define WORDS_BIGENDIAN 1
# endif
#else
# ifndef WORDS_BIGENDIAN
#  undef WORDS_BIGENDIAN
# endif
#endif

@vstinner
Fix more #ifdef
6bcf9ff 
_ctypes/malloc_closure.c: #ifdef HAVE_FFI_CLOSURE_ALLOC, #ifdef USING_APPLE_OS_LIBFFI
@vstinner vstinner merged commit b556f53 into python:main Feb 7, 2022
@vstinner vstinner deleted the pytime_apple branch February 7, 2022 00:46
@vstinner vstinner mentioned this pull request Oct 25, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@abalkin abalkin Awaiting requested review from abalkin

@pganssle pganssle Awaiting requested review from pganssle pganssle is a code owner

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@vstinner @the-knights-who-say-ni @bedevere-bot