summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorYuyi Wang <Strawberry_Str@hotmail.com>2022-05-24 12:57:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-05-24 23:06:02 (GMT)
commit5ec711082255d1a580e3270c40ca76d655a3dd7c (patch)
tree304f4358942800328d86cab0e0b4409a0b9ce905 /contrib
parent80431510a2b97e08bd577f39934e2b5ea9a43034 (diff)
downloadgit-5ec711082255d1a580e3270c40ca76d655a3dd7c.zip
git-5ec711082255d1a580e3270c40ca76d655a3dd7c.tar.gz
git-5ec711082255d1a580e3270c40ca76d655a3dd7c.tar.bz2
cmake: remove (_)UNICODE def on Windows in CMakeLists.txt
`UNICODE` and `_UNICODE` are not required when building git on Windows. Actually, they should not be predefined at all. There're 2 evidences that `(_)UNICODE` is supposed to be nonexist: compat/win32/trace2_win32_process_info.c:83: It uses jw_array_string which accepts pe32.szExeFile as const char*. t/helper/test-drop-caches.c:16: Calling to GetCurrentDirectory with Buffer as char*. The autotools build system never defines `UNICODE` and `_UNICODE` and builds on Windows well. Signed-off-by: Yuyi Wang <Strawberry_Str@hotmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/buildsystems/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 2844dd6..29acc4f 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -270,7 +270,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
_CONSOLE DETECT_MSYS_TTY STRIP_EXTENSION=".exe" NO_SYMLINK_HEAD UNRELIABLE_FSTAT
NOGDI OBJECT_CREATION_MODE=1 __USE_MINGW_ANSI_STDIO=0
USE_NED_ALLOCATOR OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP
- UNICODE _UNICODE HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET HAVE_RTLGENRANDOM)
+ HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET HAVE_RTLGENRANDOM)
list(APPEND compat_SOURCES
compat/mingw.c
compat/winansi.c