mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

; Avoid compiler warnings in MinGW builds

Browse source 
* src/w32proc.c (child_proc_count, child_procs)
(Vw32_valid_locale_ids, Vw32_valid_codepages): Declare 'static'.
* src/w32inevt.c (faked_key): Declare.
* src/w32heap.c (data_region_base, data_region_end, heap): Declare.
* src/w32console.c (keyboard_handle, current_tty, cost): Declare.
* src/w32.c: Declare function pointers 'static'.
(excptr, excprec, ctxrec, g_b_init_compare_string_w)
(g_b_init_debug_break_process, LookupAccountSid_Name, dir_static)
(winsock_lib, _wsa_errlist): Declare.
* src/w32uniscribe.c: Declare function pointers 'static'.
(uniscribe_available, harfbuzz_available): Declare.
* src/w32term.c: Declare function pointers 'static'.
(vertical_scroll_bar_min_handle, horizontal_scroll_bar_min_handle)
(vertical_scroll_bar_top_border)
(vertical_scroll_bar_bottom_border)
(horizontal_scroll_bar_left_border)
(horizontal_scroll_bar_right_border, last_scroll_bar_drag_pos):
Declare 'static'.
* src/w32xfns.c (input_available, interrupt_handle, lpHead)
(lpTail, nQueue): Declare.
* src/w32menu.c: Declare function pointers 'static'.
* src/w32term.h (w32_frame_parm_handlers): Declare.
* src/w32fns.c: Declare function pointers 'static'.
(w32_darkmode, w32_color_map, deferred_msg_head, tip_frame)
(tip_timer, tip_last_string, tip_last_frame, tip_last_parms):
* src/lisp.h (daemon_type): Declare for WINDOWSNT as well.
* nt/cmdproxy.c (escape_char, child, interactive): Declare 'static'.
(Bug#78193)
This commit is contained in:
Eli Zaretskii 2025-06-01 12:05:23 +03:00
parent c3d9581f84
commit f77c8c7d45
13 changed files with 122 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nt/cmdproxy.c
View file

@ -159,7 +159,7 @@ skip_nonspace (const char *str)
/* This value is never changed by the code. We keep the code that /* This value is never changed by the code. We keep the code that
supports also the value of '"', but let's allow the compiler to supports also the value of '"', but let's allow the compiler to
optimize it out, until someone actually uses that. */ optimize it out, until someone actually uses that. */
const int escape_char = '\\'; static const int escape_char = '\\';
/* Get next token from input, advancing pointer. */ /* Get next token from input, advancing pointer. */
static int static int
@ -509,8 +509,8 @@ setup_argv (void)
termination when interrupted. At the moment, only one child process termination when interrupted. At the moment, only one child process
can be running at any one time. */ can be running at any one time. */
PROCESS_INFORMATION child; static PROCESS_INFORMATION child;
int interactive = TRUE; static int interactive = TRUE;
BOOL console_event_handler (DWORD); BOOL console_event_handler (DWORD);

5
src/lisp.h
View file

@ -5171,9 +5171,10 @@ extern bool no_site_lisp;
/* True means put details like time stamps into builds. */ /* True means put details like time stamps into builds. */
extern bool build_details; extern bool build_details;
#ifndef WINDOWSNT /* 0 not a daemon, 1 new-style (foreground), 2 old-style (background).
/* 0 not a daemon, 1 foreground daemon, 2 background daemon. */ A negative value means the daemon initialization was already done. */
extern int daemon_type; extern int daemon_type;
#ifndef WINDOWSNT
#define IS_DAEMON (daemon_type != 0) #define IS_DAEMON (daemon_type != 0)
/* Non-zero means daemon-initialized has not yet been called. */ /* Non-zero means daemon-initialized has not yet been called. */
#define DAEMON_RUNNING (daemon_type >= 0) #define DAEMON_RUNNING (daemon_type >= 0)

86
src/w32.c
View file

@ -126,8 +126,11 @@ typedef struct _MEMORY_STATUS_EX {
(excptr->ExceptionRecord->ExceptionCode) and the address where the (excptr->ExceptionRecord->ExceptionCode) and the address where the
exception happened (excptr->ExceptionRecord->ExceptionAddress), as exception happened (excptr->ExceptionRecord->ExceptionAddress), as
well as some additional information specific to the exception. */ well as some additional information specific to the exception. */
extern PEXCEPTION_POINTERS excptr;
PEXCEPTION_POINTERS excptr; PEXCEPTION_POINTERS excptr;
extern PEXCEPTION_RECORD excprec;
PEXCEPTION_RECORD excprec; PEXCEPTION_RECORD excprec;
extern PCONTEXT ctxrec;
PCONTEXT ctxrec; PCONTEXT ctxrec;
#include <lmcons.h> #include <lmcons.h>
@ -353,7 +356,9 @@ static BOOL g_b_init_expand_environment_strings_w;
static BOOL g_b_init_get_user_default_ui_language; static BOOL g_b_init_get_user_default_ui_language;
static BOOL g_b_init_get_console_font_size; static BOOL g_b_init_get_console_font_size;
extern BOOL g_b_init_compare_string_w;
BOOL g_b_init_compare_string_w; BOOL g_b_init_compare_string_w;
extern BOOL g_b_init_debug_break_process;
BOOL g_b_init_debug_break_process; BOOL g_b_init_debug_break_process;
/* /*
@ -379,12 +384,12 @@ typedef BOOL (WINAPI * GetProcessTimes_Proc) (
LPFILETIME kernel_time, LPFILETIME kernel_time,
LPFILETIME user_time); LPFILETIME user_time);
GetProcessTimes_Proc get_process_times_fn = NULL; static GetProcessTimes_Proc get_process_times_fn = NULL;
#ifdef _UNICODE #ifdef _UNICODE
const char * const LookupAccountSid_Name = "LookupAccountSidW"; static const char * const LookupAccountSid_Name = "LookupAccountSidW";
#else #else
const char * const LookupAccountSid_Name = "LookupAccountSidA"; static const char * const LookupAccountSid_Name = "LookupAccountSidA";
#endif #endif
typedef BOOL (WINAPI * LookupAccountSid_Proc) ( typedef BOOL (WINAPI * LookupAccountSid_Proc) (
LPCTSTR lpSystemName, LPCTSTR lpSystemName,
@ -3647,7 +3652,7 @@ is_exec (const char * name)
the code that calls them doesn't grok UTF-8 encoded file names we the code that calls them doesn't grok UTF-8 encoded file names we
produce in dirent->d_name[]. */ produce in dirent->d_name[]. */
struct dirent dir_static; /* simulated directory contents */ static struct dirent dir_static; /* simulated directory contents */
static HANDLE dir_find_handle = INVALID_HANDLE_VALUE; static HANDLE dir_find_handle = INVALID_HANDLE_VALUE;
static int dir_is_fat; static int dir_is_fat;
static char dir_pathname[MAX_UTF8_PATH]; static char dir_pathname[MAX_UTF8_PATH];
@ -4777,7 +4782,7 @@ int
sys_rename_replace (const char *oldname, const char *newname, BOOL force) sys_rename_replace (const char *oldname, const char *newname, BOOL force)
{ {
BOOL result; BOOL result;
char temp[MAX_UTF8_PATH], temp_a[MAX_PATH]; char temp[MAX_UTF8_PATH], temp_a[MAX_PATH + 15]; /* "+ 15": pacify GCC */
int newname_dev; int newname_dev;
int oldname_dev; int oldname_dev;
bool have_temp_a = false; bool have_temp_a = false;
@ -7760,55 +7765,56 @@ w32_memory_info (unsigned long long *totalram, unsigned long long *freeram,
(eg. gethostname). */ (eg. gethostname). */
/* function pointers for relevant socket functions */ /* function pointers for relevant socket functions */
int (PASCAL *pfn_WSAStartup) (WORD wVersionRequired, LPWSADATA lpWSAData); static int (PASCAL *pfn_WSAStartup) (WORD wVersionRequired, LPWSADATA lpWSAData);
void (PASCAL *pfn_WSASetLastError) (int iError); static void (PASCAL *pfn_WSASetLastError) (int iError);
int (PASCAL *pfn_WSAGetLastError) (void); static int (PASCAL *pfn_WSAGetLastError) (void);
int (PASCAL *pfn_WSAEventSelect) (SOCKET s, HANDLE hEventObject, long lNetworkEvents); static int (PASCAL *pfn_WSAEventSelect) (SOCKET s, HANDLE hEventObject, long lNetworkEvents);
int (PASCAL *pfn_WSAEnumNetworkEvents) (SOCKET s, HANDLE hEventObject, static int (PASCAL *pfn_WSAEnumNetworkEvents) (SOCKET s, HANDLE hEventObject,
WSANETWORKEVENTS *NetworkEvents); WSANETWORKEVENTS *NetworkEvents);
HANDLE (PASCAL *pfn_WSACreateEvent) (void); static HANDLE (PASCAL *pfn_WSACreateEvent) (void);
int (PASCAL *pfn_WSACloseEvent) (HANDLE hEvent); static int (PASCAL *pfn_WSACloseEvent) (HANDLE hEvent);
int (PASCAL *pfn_socket) (int af, int type, int protocol); static int (PASCAL *pfn_socket) (int af, int type, int protocol);
int (PASCAL *pfn_bind) (SOCKET s, const struct sockaddr *addr, int namelen); static int (PASCAL *pfn_bind) (SOCKET s, const struct sockaddr *addr, int namelen);
int (PASCAL *pfn_connect) (SOCKET s, const struct sockaddr *addr, int namelen); static int (PASCAL *pfn_connect) (SOCKET s, const struct sockaddr *addr, int namelen);
int (PASCAL *pfn_ioctlsocket) (SOCKET s, long cmd, u_long *argp); static int (PASCAL *pfn_ioctlsocket) (SOCKET s, long cmd, u_long *argp);
int (PASCAL *pfn_recv) (SOCKET s, char * buf, int len, int flags); static int (PASCAL *pfn_recv) (SOCKET s, char * buf, int len, int flags);
int (PASCAL *pfn_send) (SOCKET s, const char * buf, int len, int flags); static int (PASCAL *pfn_send) (SOCKET s, const char * buf, int len, int flags);
int (PASCAL *pfn_closesocket) (SOCKET s); static int (PASCAL *pfn_closesocket) (SOCKET s);
int (PASCAL *pfn_shutdown) (SOCKET s, int how); static int (PASCAL *pfn_shutdown) (SOCKET s, int how);
int (PASCAL *pfn_WSACleanup) (void); static int (PASCAL *pfn_WSACleanup) (void);
u_short (PASCAL *pfn_htons) (u_short hostshort); static u_short (PASCAL *pfn_htons) (u_short hostshort);
u_short (PASCAL *pfn_ntohs) (u_short netshort); static u_short (PASCAL *pfn_ntohs) (u_short netshort);
u_long (PASCAL *pfn_htonl) (u_long hostlong); static u_long (PASCAL *pfn_htonl) (u_long hostlong);
u_long (PASCAL *pfn_ntohl) (u_long netlong); static u_long (PASCAL *pfn_ntohl) (u_long netlong);
unsigned long (PASCAL *pfn_inet_addr) (const char * cp); static unsigned long (PASCAL *pfn_inet_addr) (const char * cp);
int (PASCAL *pfn_gethostname) (char * name, int namelen); static int (PASCAL *pfn_gethostname) (char * name, int namelen);
struct hostent * (PASCAL *pfn_gethostbyname) (const char * name); static struct hostent * (PASCAL *pfn_gethostbyname) (const char * name);
struct servent * (PASCAL *pfn_getservbyname) (const char * name, const char * proto); static struct servent * (PASCAL *pfn_getservbyname) (const char * name, const char * proto);
int (PASCAL *pfn_getpeername) (SOCKET s, struct sockaddr *addr, int * namelen); static int (PASCAL *pfn_getpeername) (SOCKET s, struct sockaddr *addr, int * namelen);
int (PASCAL *pfn_setsockopt) (SOCKET s, int level, int optname, static int (PASCAL *pfn_setsockopt) (SOCKET s, int level, int optname,
const char * optval, int optlen); const char * optval, int optlen);
int (PASCAL *pfn_listen) (SOCKET s, int backlog); static int (PASCAL *pfn_listen) (SOCKET s, int backlog);
int (PASCAL *pfn_getsockname) (SOCKET s, struct sockaddr * name, static int (PASCAL *pfn_getsockname) (SOCKET s, struct sockaddr * name,
int * namelen); int * namelen);
SOCKET (PASCAL *pfn_accept) (SOCKET s, struct sockaddr * addr, int * addrlen); static SOCKET (PASCAL *pfn_accept) (SOCKET s, struct sockaddr * addr, int * addrlen);
int (PASCAL *pfn_recvfrom) (SOCKET s, char * buf, int len, int flags, static int (PASCAL *pfn_recvfrom) (SOCKET s, char * buf, int len, int flags,
struct sockaddr * from, int * fromlen); struct sockaddr * from, int * fromlen);
int (PASCAL *pfn_sendto) (SOCKET s, const char * buf, int len, int flags, static int (PASCAL *pfn_sendto) (SOCKET s, const char * buf, int len, int flags,
const struct sockaddr * to, int tolen); const struct sockaddr * to, int tolen);
int (PASCAL *pfn_getaddrinfo) (const char *, const char *, static int (PASCAL *pfn_getaddrinfo) (const char *, const char *,
const struct addrinfo *, struct addrinfo **); const struct addrinfo *, struct addrinfo **);
void (PASCAL *pfn_freeaddrinfo) (struct addrinfo *); static void (PASCAL *pfn_freeaddrinfo) (struct addrinfo *);
/* SetHandleInformation is only needed to make sockets non-inheritable. */ /* SetHandleInformation is only needed to make sockets non-inheritable. */
BOOL (WINAPI *pfn_SetHandleInformation) (HANDLE object, DWORD mask, DWORD flags); static BOOL (WINAPI *pfn_SetHandleInformation) (HANDLE object, DWORD mask, DWORD flags);
#ifndef HANDLE_FLAG_INHERIT #ifndef HANDLE_FLAG_INHERIT
#define HANDLE_FLAG_INHERIT 1 #define HANDLE_FLAG_INHERIT 1
#endif #endif
extern HANDLE winsock_lib;
HANDLE winsock_lib; HANDLE winsock_lib;
static int winsock_inuse; static int winsock_inuse;
@ -7971,7 +7977,7 @@ check_errno (void)
} }
/* Extend strerror to handle the winsock-specific error codes. */ /* Extend strerror to handle the winsock-specific error codes. */
struct { static struct {
int errnum; int errnum;
const char * msg; const char * msg;
} _wsa_errlist[] = { } _wsa_errlist[] = {

3
src/w32console.c
View file

@ -64,6 +64,7 @@ static CONSOLE_CURSOR_INFO console_cursor_info;
static CONSOLE_CURSOR_INFO prev_console_cursor; static CONSOLE_CURSOR_INFO prev_console_cursor;
#endif #endif
extern HANDLE keyboard_handle;
HANDLE keyboard_handle; HANDLE keyboard_handle;
int w32_console_unicode_input; int w32_console_unicode_input;
@ -623,7 +624,9 @@ sys_tgetstr (char *cap, char **area)
stubs from cm.c stubs from cm.c
***********************************************************************/ ***********************************************************************/
extern struct tty_display_info *current_tty;
struct tty_display_info *current_tty = NULL; struct tty_display_info *current_tty = NULL;
extern int cost;
int cost = 0; int cost = 0;
int evalcost (int); int evalcost (int);

56
src/w32fns.c
View file

@ -237,26 +237,28 @@ typedef struct Emacs_GESTURECONFIG
typedef BOOL (WINAPI * SetGestureConfig_proc) (HWND, DWORD, UINT, typedef BOOL (WINAPI * SetGestureConfig_proc) (HWND, DWORD, UINT,
Emacs_PGESTURECONFIG, UINT); Emacs_PGESTURECONFIG, UINT);
TrackMouseEvent_Proc track_mouse_event_fn = NULL; static TrackMouseEvent_Proc track_mouse_event_fn = NULL;
ImmGetCompositionString_Proc get_composition_string_fn = NULL; static ImmGetCompositionString_Proc get_composition_string_fn = NULL;
ImmGetContext_Proc get_ime_context_fn = NULL; static ImmGetContext_Proc get_ime_context_fn = NULL;
ImmGetOpenStatus_Proc get_ime_open_status_fn = NULL; static ImmGetOpenStatus_Proc get_ime_open_status_fn = NULL;
ImmSetOpenStatus_Proc set_ime_open_status_fn = NULL; static ImmSetOpenStatus_Proc set_ime_open_status_fn = NULL;
ImmReleaseContext_Proc release_ime_context_fn = NULL; static ImmReleaseContext_Proc release_ime_context_fn = NULL;
ImmSetCompositionWindow_Proc set_ime_composition_window_fn = NULL; static ImmSetCompositionWindow_Proc set_ime_composition_window_fn = NULL;
MonitorFromPoint_Proc monitor_from_point_fn = NULL; static MonitorFromPoint_Proc monitor_from_point_fn = NULL;
GetMonitorInfo_Proc get_monitor_info_fn = NULL; static GetMonitorInfo_Proc get_monitor_info_fn = NULL;
MonitorFromWindow_Proc monitor_from_window_fn = NULL; static MonitorFromWindow_Proc monitor_from_window_fn = NULL;
EnumDisplayMonitors_Proc enum_display_monitors_fn = NULL; static EnumDisplayMonitors_Proc enum_display_monitors_fn = NULL;
GetTitleBarInfo_Proc get_title_bar_info_fn = NULL; static GetTitleBarInfo_Proc get_title_bar_info_fn = NULL;
extern IsDebuggerPresent_Proc is_debugger_present;
IsDebuggerPresent_Proc is_debugger_present = NULL; IsDebuggerPresent_Proc is_debugger_present = NULL;
extern SetThreadDescription_Proc set_thread_description;
SetThreadDescription_Proc set_thread_description = NULL; SetThreadDescription_Proc set_thread_description = NULL;
SetWindowTheme_Proc SetWindowTheme_fn = NULL; static SetWindowTheme_Proc SetWindowTheme_fn = NULL;
DwmSetWindowAttribute_Proc DwmSetWindowAttribute_fn = NULL; static DwmSetWindowAttribute_Proc DwmSetWindowAttribute_fn = NULL;
WTSUnRegisterSessionNotification_Proc WTSUnRegisterSessionNotification_fn = NULL; static WTSUnRegisterSessionNotification_Proc WTSUnRegisterSessionNotification_fn = NULL;
WTSRegisterSessionNotification_Proc WTSRegisterSessionNotification_fn = NULL; static WTSRegisterSessionNotification_Proc WTSRegisterSessionNotification_fn = NULL;
RegisterTouchWindow_proc RegisterTouchWindow_fn = NULL; static RegisterTouchWindow_proc RegisterTouchWindow_fn = NULL;
SetGestureConfig_proc SetGestureConfig_fn = NULL; static SetGestureConfig_proc SetGestureConfig_fn = NULL;
extern AppendMenuW_Proc unicode_append_menu; extern AppendMenuW_Proc unicode_append_menu;
@ -312,7 +314,7 @@ int w32_minor_version;
int w32_build_number; int w32_build_number;
/* If the OS is set to use dark mode. */ /* If the OS is set to use dark mode. */
BOOL w32_darkmode = FALSE; static BOOL w32_darkmode = FALSE;
/* Distinguish between Windows NT and Windows 95. */ /* Distinguish between Windows NT and Windows 95. */
int os_subtype; int os_subtype;
@ -574,7 +576,7 @@ typedef struct colormap_t
COLORREF colorref; COLORREF colorref;
} colormap_t; } colormap_t;
colormap_t w32_color_map[] = static colormap_t w32_color_map[] =
{ {
{"snow" , PALETTERGB (255,250,250)}, {"snow" , PALETTERGB (255,250,250)},
{"ghost white" , PALETTERGB (248,248,255)}, {"ghost white" , PALETTERGB (248,248,255)},
@ -3816,7 +3818,7 @@ w32_msg_pump (deferred_msg * msg_buf)
} }
} }
deferred_msg * deferred_msg_head; static deferred_msg * deferred_msg_head;
static deferred_msg * static deferred_msg *
find_deferred_msg (HWND hwnd, UINT msg) find_deferred_msg (HWND hwnd, UINT msg)
@ -7356,7 +7358,7 @@ static void compute_tip_xy (struct frame *, Lisp_Object, Lisp_Object,
Lisp_Object, int, int, int *, int *); Lisp_Object, int, int, int *, int *);
/* The frame of the currently visible tooltip. */ /* The frame of the currently visible tooltip. */
Lisp_Object tip_frame; static Lisp_Object tip_frame;
/* The window-system window corresponding to the frame of the /* The window-system window corresponding to the frame of the
currently visible tooltip. */ currently visible tooltip. */
@ -7364,16 +7366,16 @@ Window tip_window;
/* A timer that hides or deletes the currently visible tooltip when it /* A timer that hides or deletes the currently visible tooltip when it
fires. */ fires. */
Lisp_Object tip_timer; static Lisp_Object tip_timer;
/* STRING argument of last `x-show-tip' call. */ /* STRING argument of last `x-show-tip' call. */
Lisp_Object tip_last_string; static Lisp_Object tip_last_string;
/* Normalized FRAME argument of last `x-show-tip' call. */ /* Normalized FRAME argument of last `x-show-tip' call. */
Lisp_Object tip_last_frame; static Lisp_Object tip_last_frame;
/* PARMS argument of last `x-show-tip' call. */ /* PARMS argument of last `x-show-tip' call. */
Lisp_Object tip_last_parms; static Lisp_Object tip_last_parms;
static void static void
@ -10901,7 +10903,7 @@ w32_get_resource (const char *key, const char *name, LPDWORD lpdwtype)
***********************************************************************/ ***********************************************************************/
typedef BOOL (WINAPI * SystemParametersInfoW_Proc) (UINT,UINT,PVOID,UINT); typedef BOOL (WINAPI * SystemParametersInfoW_Proc) (UINT,UINT,PVOID,UINT);
SystemParametersInfoW_Proc system_parameters_info_w_fn = NULL; static SystemParametersInfoW_Proc system_parameters_info_w_fn = NULL;
DEFUN ("w32-set-wallpaper", Fw32_set_wallpaper, Sw32_set_wallpaper, 1, 1, 0, DEFUN ("w32-set-wallpaper", Fw32_set_wallpaper, Sw32_set_wallpaper, 1, 1, 0,
doc: /* Set the desktop wallpaper image to IMAGE-FILE. */) doc: /* Set the desktop wallpaper image to IMAGE-FILE. */)

6
src/w32heap.c
View file

@ -87,14 +87,14 @@ typedef struct _RTL_HEAP_PARAMETERS {
} RTL_HEAP_PARAMETERS, *PRTL_HEAP_PARAMETERS; } RTL_HEAP_PARAMETERS, *PRTL_HEAP_PARAMETERS;
/* Info for keeping track of our dynamic heap used after dumping. */ /* Info for keeping track of our dynamic heap used after dumping. */
unsigned char *data_region_base = NULL; static unsigned char *data_region_base = NULL;
unsigned char *data_region_end = NULL; static unsigned char *data_region_end = NULL;
/* Handle for the private heap: /* Handle for the private heap:
- inside the dumped_data[] array before dump with unexec, - inside the dumped_data[] array before dump with unexec,
- outside of it after dump, or always if pdumper is used. - outside of it after dump, or always if pdumper is used.
*/ */
HANDLE heap = NULL; static HANDLE heap = NULL;
/* We redirect the standard allocation functions. */ /* We redirect the standard allocation functions. */
malloc_fn the_malloc_fn; malloc_fn the_malloc_fn;

1
src/w32inevt.c
View file

@ -72,6 +72,7 @@ w32_read_console_input (HANDLE h, INPUT_RECORD *rec, DWORD recsize,
} }
/* Set by w32_console_toggle_lock_key. */ /* Set by w32_console_toggle_lock_key. */
extern int faked_key;
int faked_key; int faked_key;
static int static int

14
src/w32menu.c
View file

@ -141,15 +141,17 @@ typedef HRESULT (WINAPI *TaskDialogIndirect_Proc) (
OUT BOOL *pfVerificationFlagChecked); OUT BOOL *pfVerificationFlagChecked);
#ifdef NTGUI_UNICODE #ifdef NTGUI_UNICODE
GetMenuItemInfoA_Proc get_menu_item_info = GetMenuItemInfoA; static GetMenuItemInfoA_Proc get_menu_item_info = GetMenuItemInfoA;
SetMenuItemInfoA_Proc set_menu_item_info = SetMenuItemInfoA; static SetMenuItemInfoA_Proc set_menu_item_info = SetMenuItemInfoA;
extern AppendMenuW_Proc unicode_append_menu;
AppendMenuW_Proc unicode_append_menu = AppendMenuW; AppendMenuW_Proc unicode_append_menu = AppendMenuW;
MessageBoxW_Proc unicode_message_box = MessageBoxW; static MessageBoxW_Proc unicode_message_box = MessageBoxW;
#else /* !NTGUI_UNICODE */ #else /* !NTGUI_UNICODE */
GetMenuItemInfoA_Proc get_menu_item_info = NULL; static GetMenuItemInfoA_Proc get_menu_item_info = NULL;
SetMenuItemInfoA_Proc set_menu_item_info = NULL; static SetMenuItemInfoA_Proc set_menu_item_info = NULL;
extern AppendMenuW_Proc unicode_append_menu;
AppendMenuW_Proc unicode_append_menu = NULL; AppendMenuW_Proc unicode_append_menu = NULL;
MessageBoxW_Proc unicode_message_box = NULL; static MessageBoxW_Proc unicode_message_box = NULL;
#endif /* NTGUI_UNICODE */ #endif /* NTGUI_UNICODE */
static TaskDialogIndirect_Proc task_dialog_indirect; static TaskDialogIndirect_Proc task_dialog_indirect;

8
src/w32proc.c
View file

@ -1795,8 +1795,8 @@ msg_wait_for_objects (DWORD nCount, HANDLE *lpHandles,
#define _P_NOWAIT 1 #define _P_NOWAIT 1
/* Child process management list. */ /* Child process management list. */
int child_proc_count = 0; static int child_proc_count = 0;
child_process child_procs[ MAX_CHILDREN ]; static child_process child_procs[ MAX_CHILDREN ];
static DWORD WINAPI reader_thread (void *arg); static DWORD WINAPI reader_thread (void *arg);
@ -4293,7 +4293,7 @@ int_from_hex (char * s)
/* We need to build a global list, since the EnumSystemLocale callback /* We need to build a global list, since the EnumSystemLocale callback
function isn't given a context pointer. */ function isn't given a context pointer. */
Lisp_Object Vw32_valid_locale_ids; static Lisp_Object Vw32_valid_locale_ids;
static BOOL CALLBACK ALIGN_STACK static BOOL CALLBACK ALIGN_STACK
enum_locale_fn (LPTSTR localeNum) enum_locale_fn (LPTSTR localeNum)
@ -4357,7 +4357,7 @@ If successful, the new locale id is returned, otherwise nil. */)
/* We need to build a global list, since the EnumCodePages callback /* We need to build a global list, since the EnumCodePages callback
function isn't given a context pointer. */ function isn't given a context pointer. */
Lisp_Object Vw32_valid_codepages; static Lisp_Object Vw32_valid_codepages;
static BOOL CALLBACK ALIGN_STACK static BOOL CALLBACK ALIGN_STACK
enum_codepage_fn (LPTSTR codepageNum) enum_codepage_fn (LPTSTR codepageNum)

22
src/w32term.c
View file

@ -118,10 +118,10 @@ typedef struct tagGLYPHSET
#endif /* compiling for pre-Win2k */ #endif /* compiling for pre-Win2k */
/* Dynamic linking to SetLayeredWindowAttribute (only since 2000). */ /* Dynamic linking to SetLayeredWindowAttribute (only since 2000). */
BOOL (WINAPI *pfnSetLayeredWindowAttributes) (HWND, COLORREF, BYTE, DWORD); static BOOL (WINAPI *pfnSetLayeredWindowAttributes) (HWND, COLORREF, BYTE, DWORD);
/* PlgBlt is available since Windows 2000. */ /* PlgBlt is available since Windows 2000. */
BOOL (WINAPI *pfnPlgBlt) (HDC, const POINT *, HDC, int, int, int, int, HBITMAP, int, int); static BOOL (WINAPI *pfnPlgBlt) (HDC, const POINT *, HDC, int, int, int, int, HBITMAP, int, int);
/* Define required types and constants on systems with older headers /* Define required types and constants on systems with older headers
lest they be absent. */ lest they be absent. */
@ -159,8 +159,8 @@ typedef struct _TOUCHINPUT
typedef BOOL (WINAPI * CloseTouchInputHandle_proc) (HANDLE); typedef BOOL (WINAPI * CloseTouchInputHandle_proc) (HANDLE);
typedef BOOL (WINAPI * GetTouchInputInfo_proc) (HANDLE, UINT, PTOUCHINPUT, int); typedef BOOL (WINAPI * GetTouchInputInfo_proc) (HANDLE, UINT, PTOUCHINPUT, int);
CloseTouchInputHandle_proc pfnCloseTouchInputHandle; static CloseTouchInputHandle_proc pfnCloseTouchInputHandle;
GetTouchInputInfo_proc pfnGetTouchInputInfo; static GetTouchInputInfo_proc pfnGetTouchInputInfo;
#ifndef LWA_ALPHA #ifndef LWA_ALPHA
#define LWA_ALPHA 0x02 #define LWA_ALPHA 0x02
@ -193,14 +193,14 @@ HANDLE hWindowsThread = NULL;
DWORD dwMainThreadId = 0; DWORD dwMainThreadId = 0;
HANDLE hMainThread = NULL; HANDLE hMainThread = NULL;
int vertical_scroll_bar_min_handle; static int vertical_scroll_bar_min_handle;
int horizontal_scroll_bar_min_handle; static int horizontal_scroll_bar_min_handle;
int vertical_scroll_bar_top_border; static int vertical_scroll_bar_top_border;
int vertical_scroll_bar_bottom_border; static int vertical_scroll_bar_bottom_border;
int horizontal_scroll_bar_left_border; static int horizontal_scroll_bar_left_border;
int horizontal_scroll_bar_right_border; static int horizontal_scroll_bar_right_border;
int last_scroll_bar_drag_pos; static int last_scroll_bar_drag_pos;
/* Keyboard code page - may be changed by language-change events. */ /* Keyboard code page - may be changed by language-change events. */
int w32_keyboard_codepage; int w32_keyboard_codepage;

1
src/w32term.h
View file

@ -271,6 +271,7 @@ extern const char *w32_get_string_resource (void *v_rdb,
const char *class); const char *class);
/* w32fns.c */ /* w32fns.c */
extern frame_parm_handler w32_frame_parm_handlers[];
extern void w32_default_font_parameter (struct frame* f, Lisp_Object parms); extern void w32_default_font_parameter (struct frame* f, Lisp_Object parms);
extern Lisp_Object w32_process_dnd_data (int format, void *pDataObj); extern Lisp_Object w32_process_dnd_data (int format, void *pDataObj);

8
src/w32uniscribe.c
View file

@ -44,6 +44,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#include "pdumper.h" #include "pdumper.h"
#include "w32common.h" #include "w32common.h"
extern int uniscribe_available;
int uniscribe_available = 0; int uniscribe_available = 0;
/* EnumFontFamiliesEx callback. */ /* EnumFontFamiliesEx callback. */
@ -53,6 +54,7 @@ static int CALLBACK ALIGN_STACK add_opentype_font_name_to_list (ENUMLOGFONTEX *,
#ifdef HAVE_HARFBUZZ #ifdef HAVE_HARFBUZZ
struct font_driver harfbuzz_font_driver; struct font_driver harfbuzz_font_driver;
extern int harfbuzz_available;
int harfbuzz_available = 0; int harfbuzz_available = 0;
/* Typedefs for HarfBuzz functions which we call through function /* Typedefs for HarfBuzz functions which we call through function
@ -811,9 +813,9 @@ typedef HRESULT (WINAPI *ScriptGetFontLanguageTags_Proc)
typedef HRESULT (WINAPI *ScriptGetFontFeatureTags_Proc) typedef HRESULT (WINAPI *ScriptGetFontFeatureTags_Proc)
(HDC, SCRIPT_CACHE *, SCRIPT_ANALYSIS *, OPENTYPE_TAG, OPENTYPE_TAG, int, OPENTYPE_TAG *, int *); (HDC, SCRIPT_CACHE *, SCRIPT_ANALYSIS *, OPENTYPE_TAG, OPENTYPE_TAG, int, OPENTYPE_TAG *, int *);
ScriptGetFontScriptTags_Proc script_get_font_scripts_fn; static ScriptGetFontScriptTags_Proc script_get_font_scripts_fn;
ScriptGetFontLanguageTags_Proc script_get_font_languages_fn; static ScriptGetFontLanguageTags_Proc script_get_font_languages_fn;
ScriptGetFontFeatureTags_Proc script_get_font_features_fn; static ScriptGetFontFeatureTags_Proc script_get_font_features_fn;
static bool uniscribe_new_apis; static bool uniscribe_new_apis;

9
src/w32xfns.c
View file

@ -50,7 +50,8 @@ CRITICAL_SECTION critsect;
extern HANDLE keyboard_handle; extern HANDLE keyboard_handle;
#endif /* WINDOWSNT */ #endif /* WINDOWSNT */
HANDLE input_available = NULL; static HANDLE input_available = NULL;
extern HANDLE interrupt_handle;
HANDLE interrupt_handle = NULL; HANDLE interrupt_handle = NULL;
void void
@ -265,9 +266,9 @@ typedef struct int_msg
struct int_msg *lpNext; struct int_msg *lpNext;
} int_msg; } int_msg;
int_msg *lpHead = NULL; static int_msg *lpHead = NULL;
int_msg *lpTail = NULL; static int_msg *lpTail = NULL;
int nQueue = 0; static int nQueue = 0;
BOOL BOOL
get_next_msg (W32Msg * lpmsg, BOOL bWait) get_next_msg (W32Msg * lpmsg, BOOL bWait)