Integrate launcher.c

mdboom · Jul 25, 2024 · 563d68c · 563d68c
1 parent 833f851
commit 563d68c
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 36 deletions.
diff --git a/Include/internal/pycore_magic_number.h b/Include/internal/pycore_magic_number.h
@@ -281,6 +281,42 @@ in PC/launcher.c must also be updated.
 
 #define PYC_MAGIC_NUMBER 3602
 
+#define MAX_VERSION_SIZE 8
+
+typedef struct {
+    unsigned short min;
+    unsigned short max;
+    wchar_t version[MAX_VERSION_SIZE];
+} PYC_MAGIC;
+
+static PYC_MAGIC magic_values[] = {
+    { 50823, 50823, L"2.0" },
+    { 60202, 60202, L"2.1" },
+    { 60717, 60717, L"2.2" },
+    { 62011, 62021, L"2.3" },
+    { 62041, 62061, L"2.4" },
+    { 62071, 62131, L"2.5" },
+    { 62151, 62161, L"2.6" },
+    { 62171, 62211, L"2.7" },
+    { 3000, 3131, L"3.0" },
+    { 3141, 3151, L"3.1" },
+    { 3160, 3180, L"3.2" },
+    { 3190, 3230, L"3.3" },
+    { 3250, 3310, L"3.4" },
+    { 3320, 3351, L"3.5" },
+    { 3360, 3379, L"3.6" },
+    { 3390, 3399, L"3.7" },
+    { 3400, 3419, L"3.8" },
+    { 3420, 3429, L"3.9" },
+    { 3430, 3449, L"3.10" },
+    /* Allow 50 magic numbers per version from here on */
+    { 3450, 3499, L"3.11" },
+    { 3500, 3549, L"3.12" },
+    { 3550, 3599, L"3.13" },
+    { 3600, 3649, L"3.14" },
+    { 0 }
+};
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/PC/launcher.c b/PC/launcher.c
@@ -13,6 +13,8 @@
 #include <stdio.h>
 #include <tchar.h>
 
+#include "../Include/internal/pycore_magic_number.h"
+
 #define BUFSIZE 256
 #define MSGSIZE 1024
 
@@ -166,8 +168,6 @@ static wchar_t * get_env(wchar_t * key)
 #endif
 #endif
 
-#define MAX_VERSION_SIZE    8
-
 typedef struct {
     wchar_t version[MAX_VERSION_SIZE]; /* m.n */
     int bits;   /* 32 or 64 */
@@ -1241,40 +1241,6 @@ validate_version(wchar_t * p)
 
 }
 
-typedef struct {
-    unsigned short min;
-    unsigned short max;
-    wchar_t version[MAX_VERSION_SIZE];
-} PYC_MAGIC;
-
-static PYC_MAGIC magic_values[] = {
-    { 50823, 50823, L"2.0" },
-    { 60202, 60202, L"2.1" },
-    { 60717, 60717, L"2.2" },
-    { 62011, 62021, L"2.3" },
-    { 62041, 62061, L"2.4" },
-    { 62071, 62131, L"2.5" },
-    { 62151, 62161, L"2.6" },
-    { 62171, 62211, L"2.7" },
-    { 3000, 3131, L"3.0" },
-    { 3141, 3151, L"3.1" },
-    { 3160, 3180, L"3.2" },
-    { 3190, 3230, L"3.3" },
-    { 3250, 3310, L"3.4" },
-    { 3320, 3351, L"3.5" },
-    { 3360, 3379, L"3.6" },
-    { 3390, 3399, L"3.7" },
-    { 3400, 3419, L"3.8" },
-    { 3420, 3429, L"3.9" },
-    { 3430, 3449, L"3.10" },
-    /* Allow 50 magic numbers per version from here on */
-    { 3450, 3499, L"3.11" },
-    { 3500, 3549, L"3.12" },
-    { 3550, 3599, L"3.13" },
-    { 3600, 3649, L"3.14" },
-    { 0 }
-};
-
 static INSTALLED_PYTHON *
 find_by_magic(unsigned short magic)
 {