diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-04 22:46:37 +0100 |
---|---|---|
committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 16:31:12 +0100 |
commit | fc346cb2925d4647ccd65177660bffab13cbe253 (patch) | |
tree | 414c061e84002c2f65ef9b3d50646128217dcac4 /config.mak.uname | |
parent | Git 2.21 (diff) | |
parent | Git 2.20.2 (diff) | |
download | tgif-fc346cb2925d4647ccd65177660bffab13cbe253.tar.xz |
Sync with 2.20.2
* maint-2.20: (36 commits)
Git 2.20.2
t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
Git 2.19.3
Git 2.18.2
Git 2.17.3
Git 2.16.6
test-drop-caches: use `has_dos_drive_prefix()`
Git 2.15.4
Git 2.14.6
mingw: handle `subst`-ed "DOS drives"
mingw: refuse to access paths with trailing spaces or periods
mingw: refuse to access paths with illegal characters
unpack-trees: let merged_entry() pass through do_add_entry()'s errors
quote-stress-test: offer to test quoting arguments for MSYS2 sh
t6130/t9350: prepare for stringent Win32 path validation
quote-stress-test: allow skipping some trials
quote-stress-test: accept arguments to test via the command-line
tests: add a helper to stress test argument quoting
mingw: fix quoting of arguments
Disallow dubiously-nested submodule git directories
...
Diffstat (limited to 'config.mak.uname')
-rw-r--r-- | config.mak.uname | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config.mak.uname b/config.mak.uname index b37fa8424c..76d6c0043a 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -399,7 +399,6 @@ ifeq ($(uname_S),Windows) EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj PTHREAD_LIBS = lib = - BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1 ifndef DEBUG BASIC_CFLAGS += -GL -Os -MD BASIC_LDFLAGS += -LTCG @@ -549,7 +548,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) compat/win32/path-utils.o \ compat/win32/pthread.o compat/win32/syslog.o \ compat/win32/dirent.o - BASIC_CFLAGS += -DWIN32 -DPROTECT_NTFS_DEFAULT=1 + BASIC_CFLAGS += -DWIN32 EXTLIBS += -lws2_32 GITLIBS += git.res PTHREAD_LIBS = |