Alexandre Julliard : ntdll: Make the is_win64 variable global.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4e2bd548b1ccee3c76568de19aa50904d4834fa7
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4e2bd548b1ccee3c76568de19...

Author: Alexandre Julliard 
Date:   Fri Mar 26 14:23:02 2021 +0100

ntdll: Make the is_win64 variable global.

Signed-off-by: Alexandre Julliard

---

dlls/ntdll/unix/loader.c       | 2 --
 dlls/ntdll/unix/process.c      | 2 --
 dlls/ntdll/unix/server.c       | 2 --
 dlls/ntdll/unix/unix_private.h | 2 ++
 dlls/ntdll/unix/virtual.c      | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index f89ec12dc7e..dd966729763 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -114,8 +114,6 @@ static const BOOL use_preloader = TRUE;
 static const BOOL use_preloader = FALSE;
 #endif

-static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
-
 static char *argv0;
 static const char *bin_dir;
 static const char *dll_dir;
diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c
index 1a92235de20..b020e15eaee 100644
--- a/dlls/ntdll/unix/process.c
+++ b/dlls/ntdll/unix/process.c
@@ -70,8 +70,6 @@ static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE | (sizeof(void *) > size
                                                            MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION |
                                                            MEM_EXECUTE_OPTION_PERMANENT : 0);

-static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
-
 static const char * const cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64" };

static UINT process_error_mode;
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 7d1231bf925..3f446e8348a 100644
--- a/dlls/ntdll/unix/server.c
+++ b/dlls/ntdll/unix/server.c
@@ -99,8 +99,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(server);
 #define SOCKETNAME "socket"        /* name of the socket file */
 #define LOCKNAME   "lock"          /* name of the lock file */

-static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
-
 static const char *server_dir;

unsigned int server_cpus = 0;
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 904667399f2..c51aee2d8e4 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -41,6 +41,8 @@ static const enum cpu_type client_cpu = CPU_ARM64;
 static const WORD current_machine = IMAGE_FILE_MACHINE_ARM64;
 #endif

+static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
+
 struct debug_info
 {
     unsigned int str_pos;       /* current position in strings buffer */
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 8ceba611875..149555f4fce 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -141,7 +141,6 @@ static const BYTE VIRTUAL_Win32Flags[16] =
 static struct wine_rb_tree views_tree;
 static pthread_mutex_t virtual_mutex;

-static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
 static const UINT page_shift = 12;
 static const UINT_PTR page_mask = 0xfff;
 static const UINT_PTR granularity_mask = 0xffff;