espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-08-26 07:19:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify __USEWIDE

Browse Source 
Prior to c6ca3dab dropping support for Cygwin 1.5, __USEWIDE was not
defined for Cygwin 1.5.  After that, it's always defined if __CYGWIN__
is, so remove __USEWIDE conditionals inside __CYGWIN__ conditionals.
This commit is contained in:
Jon Turney
2022-06-02 15:03:24 +01:00
parent 7d941aa3aa
commit 09d5a3fffc
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gdb/windows-nat.c
View File

@ -156,7 +156,6 @@ static windows_per_inferior windows_process;
# define STARTUPINFO STARTUPINFOA
#else
# define __PMAX PATH_MAX
# define __USEWIDE
# define STARTUPINFO STARTUPINFOW
#endif
@ -694,17 +693,10 @@ windows_make_so (const char *name, LPVOID load_addr)
if (access (name, F_OK) != 0)
{
if (strcasecmp (name, "ntdll.dll") == 0)
#ifdef __USEWIDE
{
GetSystemDirectoryW (buf, sizeof (buf) / sizeof (wchar_t));
wcscat (buf, L"\\ntdll.dll");
}
#else
{
GetSystemDirectoryA (buf, sizeof (buf) / sizeof (wchar_t));
strcat (buf, "\\ntdll.dll");
}
#endif
}
#endif
windows_process.solibs.emplace_back ();
@ -2416,32 +2408,21 @@ windows_nat_target::create_inferior (const char *exec_file,
__PMAX * sizeof (wchar_t)) < 0)
error (_("Error starting executable: %d"), errno);
toexec = real_path;
#ifdef __USEWIDE
len = mbstowcs (NULL, allargs, 0) + 1;
if (len == (size_t) -1)
error (_("Error starting executable: %d"), errno);
cygallargs = (wchar_t *) alloca (len * sizeof (wchar_t));
mbstowcs (cygallargs, allargs, len);
#else /* !__USEWIDE */
cygallargs = allargs;
#endif
}
else
{
sh = get_shell ();
if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, sh, shell, __PMAX) < 0)
error (_("Error starting executable via shell: %d"), errno);
#ifdef __USEWIDE
len = sizeof (L" -c 'exec '") + mbstowcs (NULL, exec_file, 0)
+ mbstowcs (NULL, allargs, 0) + 2;
cygallargs = (wchar_t *) alloca (len * sizeof (wchar_t));
swprintf (cygallargs, len, L" -c 'exec %s %s'", exec_file, allargs);
#else /* !__USEWIDE */
len = (sizeof (" -c 'exec '") + strlen (exec_file)
+ strlen (allargs) + 2);
cygallargs = (char *) alloca (len);
xsnprintf (cygallargs, len, " -c 'exec %s %s'", exec_file, allargs);
#endif /* __USEWIDE */
toexec = shell;
flags |= DEBUG_PROCESS;
}
@ -2451,18 +2432,11 @@ windows_nat_target::create_inferior (const char *exec_file,
infcwd, strlen (inferior_cwd)) < 0)
error (_("Error converting inferior cwd: %d"), errno);
#ifdef __USEWIDE
args = (wchar_t *) alloca ((wcslen (toexec) + wcslen (cygallargs) + 2)
* sizeof (wchar_t));
wcscpy (args, toexec);
wcscat (args, L" ");
wcscat (args, cygallargs);
#else /* !__USEWIDE */
args = (char *) alloca (strlen (toexec) + strlen (cygallargs) + 2);
strcpy (args, toexec);
strcat (args, " ");
strcat (args, cygallargs);
#endif /* !__USEWIDE */
#ifdef CW_CVT_ENV_TO_WINENV
/* First try to create a direct Win32 copy of the POSIX environment. */