rename platform defines

Modules/_randommodule.c

@@ -263,7 +263,7 @@ random_seed_time_pid(RandomObject *self)
     key[0] = (uint32_t)(now & 0xffffffffU);
     key[1] = (uint32_t)(now >> 32);
 
-#ifdef MS_WINDOWS_NON_DESKTOP
+#if defined(MS_WINDOWS) && !defined(MS_WINDOWS_DESKTOP_APP)
     key[2] = (uint32_t)GetCurrentProcessId();
 #elif defined(HAVE_GETPID)
     key[2] = (uint32_t)getpid();

Modules/mmapmodule.c

@@ -29,7 +29,7 @@
 #include "structmember.h"         // PyMemberDef
 #include <stddef.h>               // offsetof()
 
-#if !defined(MS_WINDOWS_NON_DESKTOP) || defined(MS_WINDOWS_GAMES)
+#if !defined(MS_WINDOWS) || defined(MS_WINDOWS_DESKTOP_APP) || defined(MS_WINDOWS_GAMES)
 
 #ifndef MS_WINDOWS
 #define UNIX
@@ -1727,4 +1727,4 @@ PyInit_mmap(void)
     return PyModuleDef_Init(&mmapmodule);
 }
 
-#endif /* !MS_WINDOWS_NON_DESKTOP || MS_WINDOWS_GAMES */
+#endif /* !MS_WINDOWS || MS_WINDOWS_DESKTOP_APP || MS_WINDOWS_GAMES */

Modules/posixmodule.c

@@ -30,7 +30,7 @@
 #  include <winioctl.h>
 #  include <lmcons.h>             // UNLEN
 #  include "osdefs.h"             // SEP
-#  ifndef MS_WINDOWS_NON_DESKTOP
+#  ifdef MS_WINDOWS_DESKTOP_APP
 #    define HAVE_SYMLINK
 #  endif
 #endif
@@ -333,7 +333,7 @@ corresponding Unix manual entries for more information on calls.");
 #  include <process.h>
 #elif defined( _MSC_VER)
   /* Microsoft compiler */
-#  ifndef MS_WINDOWS_NON_DESKTOP
+#  ifdef MS_WINDOWS_DESKTOP_APP
 #    define HAVE_GETPPID    1
 #    define HAVE_GETLOGIN   1
 #    define HAVE_SPAWNV     1
@@ -342,7 +342,7 @@ corresponding Unix manual entries for more information on calls.");
 #    define HAVE_WEXECV     1
 #    define HAVE_SYSTEM     1
 #    define HAVE_CWAIT      1
-#  endif /* !MS_WINDOWS_NON_DESKTOP */
+#  endif /* MS_WINDOWS_DESKTOP_APP */
 #  define HAVE_PIPE       1
 #  define HAVE_FSYNC      1
 #  define fsync _commit
@@ -7971,7 +7971,7 @@ static PyObject *
 os_getpid_impl(PyObject *module)
 /*[clinic end generated code: output=9ea6fdac01ed2b3c input=5a9a00f0ab68aa00]*/
 {
-#ifdef MS_WINDOWS_NON_DESKTOP
+#if defined(MS_WINDOWS) && !defined(MS_WINDOWS_DESKTOP_APP)
     return PyLong_FromUnsignedLong(GetCurrentProcessId());
 #else
     return PyLong_FromPid(getpid());
@@ -13822,7 +13822,7 @@ os_cpu_count_impl(PyObject *module)
 {
     int ncpu = 0;
 #ifdef MS_WINDOWS
-#ifndef MS_WINDOWS_NON_DESKTOP
+#ifdef MS_WINDOWS_DESKTOP_APP
     ncpu = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS);
 #endif
 #elif defined(__hpux)

Modules/socketmodule.c

@@ -270,7 +270,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\
 
 #  include <fcntl.h>
 
-#else
+#else /* MS_WINDOWS */
 
 /* MS_WINDOWS includes */
 # ifdef HAVE_FCNTL_H
@@ -281,7 +281,6 @@ shutdown(how) -- shut down traffic in one or both directions\n\
 # include <Rpc.h>
 
 /* Macros based on the IPPROTO enum, see: https://bugs.python.org/issue29515 */
-#ifdef MS_WINDOWS
 #define IPPROTO_ICMP IPPROTO_ICMP
 #define IPPROTO_IGMP IPPROTO_IGMP
 #define IPPROTO_GGP IPPROTO_GGP
@@ -312,7 +311,6 @@ shutdown(how) -- shut down traffic in one or both directions\n\
 #define IPPROTO_PGM IPPROTO_PGM  // WinSock2 only
 #define IPPROTO_L2TP IPPROTO_L2TP  // WinSock2 only
 #define IPPROTO_SCTP IPPROTO_SCTP  // WinSock2 only
-#endif /* MS_WINDOWS */
 
 /* Provides the IsWindows7SP1OrGreater() function */
 #include <versionhelpers.h>
@@ -353,7 +351,7 @@ remove_unusable_flags(PyObject *m)
     if (dict == NULL) {
         return -1;
     }
-#ifdef MS_WINDOWS_NON_DESKTOP
+#ifndef MS_WINDOWS_DESKTOP_APP
     info.dwOSVersionInfoSize = sizeof(info);
     if (!GetVersionExW((OSVERSIONINFOW*) &info)) {
         PyErr_SetFromWindowsErr(0);
@@ -374,7 +372,7 @@ remove_unusable_flags(PyObject *m)
 #endif
 
     for (int i=0; i<sizeof(win_runtime_flags)/sizeof(FlagRuntimeInfo); i++) {
-#ifndef MS_WINDOWS_NON_DESKTOP
+#ifdef MS_WINDOWS_DESKTOP_APP
         info.dwBuildNumber = win_runtime_flags[i].build_number;
         /* greater than or equal to the specified version?
            Compatibility Mode will not cheat VerifyVersionInfo(...) */
@@ -513,14 +511,14 @@ remove_unusable_flags(PyObject *m)
 #endif
 #endif
 
-#if defined(MS_WINDOWS) && !defined(MS_WINDOWS_NON_DESKTOP)
+#ifdef MS_WINDOWS_DESKTOP_APP
 #define sockaddr_rc SOCKADDR_BTH_REDEF
 
 #define USE_BLUETOOTH 1
 #define AF_BLUETOOTH AF_BTH
 #define BTPROTO_RFCOMM BTHPROTO_RFCOMM
 #define _BT_RC_MEMB(sa, memb) ((sa)->memb)
-#endif
+#endif /* MS_WINDOWS_DESKTOP_APP */
 
 /* Convert "sock_addr_t *" to "struct sockaddr *". */
 #define SAS2SA(x)       (&((x)->sa))
@@ -2885,7 +2883,7 @@ sock_accept(PySocketSockObject *s, PyObject *Py_UNUSED(ignored))
     newfd = ctx.result;
 
 #ifdef MS_WINDOWS
-#ifndef MS_WINDOWS_NON_DESKTOP
+#ifdef MS_WINDOWS_DESKTOP_APP
     if (!SetHandleInformation((HANDLE)newfd, HANDLE_FLAG_INHERIT, 0)) {
         PyErr_SetFromWindowsErr(0);
         SOCKETCLOSE(newfd);

Modules/timemodule.c

@@ -1137,7 +1137,7 @@ time_tzset(PyObject *self, PyObject *unused)
         return NULL;
     }
 
-#ifndef MS_WINDOWS_NON_DESKTOP
+#ifdef MS_WINDOWS_DESKTOP_APP
     tzset();
 #endif
 
@@ -1757,7 +1757,7 @@ init_timezone(PyObject *m)
      */
 #ifdef HAVE_DECL_TZNAME
     PyObject *otz0, *otz1;
-#ifndef MS_WINDOWS_NON_DESKTOP
+#ifdef MS_WINDOWS_DESKTOP_APP
     tzset();
 #endif
     PyModule_AddIntConstant(m, "timezone", _Py_timezone);