global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-19 07:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1958 from dscho/ansi-unicode

Browse Source 
mingw: safeguard against compiling with `-DUNICODE`
This commit is contained in:
Johannes Schindelin
2018-11-30 09:44:55 +01:00
committed by Johannes Schindelin
parent 06a9ce30f1 9763966776
commit 7a9a41596b
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compat/mingw.c
View File

@@ -1679,7 +1679,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
do_unset_environment_variables();
/* Determine whether or not we are associated to a console */
cons = CreateFile("CONOUT$", GENERIC_WRITE,
cons = CreateFileA("CONOUT$", GENERIC_WRITE,
FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL);
if (cons == INVALID_HANDLE_VALUE) {
@@ -2344,7 +2344,7 @@ struct passwd *getpwuid(int uid)
return p;
len = sizeof(user_name);
if (!GetUserName(user_name, &len)) {
if (!GetUserNameA(user_name, &len)) {
initialized = 1;
return NULL;
}
@@ -3270,7 +3270,7 @@ int is_inside_windows_container(void)
return inside_container;
inside_container = ERROR_SUCCESS ==
RegOpenKeyEx(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &handle);
RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &handle);
RegCloseKey(handle);
return inside_container;

2
compat/poll/poll.c
View File

@@ -150,7 +150,7 @@ win32_compute_revents (HANDLE h, int *p_sought)
if (!once_only)
{
NtQueryInformationFile = (PNtQueryInformationFile)
GetProcAddress (GetModuleHandle ("ntdll.dll"),
GetProcAddress (GetModuleHandleA ("ntdll.dll"),
"NtQueryInformationFile");
once_only = TRUE;
}

2
compat/win32/exit-process.h
View File

@@ -127,7 +127,7 @@ static int exit_process(HANDLE process, int exit_code)
HANDLE thread = NULL;
if (!initialized) {
HINSTANCE kernel32 = GetModuleHandle("kernel32");
HINSTANCE kernel32 = GetModuleHandleA("kernel32");
if (!kernel32)
die("BUG: cannot find kernel32");
exit_process_address = (LPTHREAD_START_ROUTINE)

4
compat/winansi.c
View File

@@ -629,12 +629,12 @@ void winansi_init(void)
/* create a named pipe to communicate with the console thread */
xsnprintf(name, sizeof(name), "\\\\.\\pipe\\winansi%lu", GetCurrentProcessId());
hwrite = CreateNamedPipe(name, PIPE_ACCESS_OUTBOUND,
hwrite = CreateNamedPipeA(name, PIPE_ACCESS_OUTBOUND,
PIPE_TYPE_BYTE | PIPE_WAIT, 1, BUFFER_SIZE, 0, 0, NULL);
if (hwrite == INVALID_HANDLE_VALUE)
die_lasterr("CreateNamedPipe failed");
hread = CreateFile(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
hread = CreateFileA(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
if (hread == INVALID_HANDLE_VALUE)
die_lasterr("CreateFile for named pipe failed");