global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 10:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert the NO_ST_BLOCKS hack.

Browse Source 
This conditional was needed to work around the missing st_blocks member
in Windows's struct stat.
This commit is contained in:
Johannes Sixt
2007-11-12 12:51:35 +01:00
parent e569ab2ae7
commit dbdc65fe2d
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -512,7 +512,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_MKDTEMP = YesPlease
NO_SVN_TESTS=YesPlease
NO_PERL_MAKEMAKER=YesPlease
COMPAT_CFLAGS += -DNO_ST_BLOCKS -DSTRIP_EXTENSION=\".exe\" -D__USE_MINGW_ACCESS -DNOGDI -I compat
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" -D__USE_MINGW_ACCESS -DNOGDI -I compat
COMPAT_OBJS += compat/mingw.o compat/fnmatch.o compat/regex.o
EXTLIBS += -lws2_32
X = .exe

4
builtin-count-objects.c
View File

@@ -43,11 +43,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,
if (lstat(path, &st) || !S_ISREG(st.st_mode))
bad = 1;
else
#ifndef NO_ST_BLOCKS
(*loose_size) += xsize_t(st.st_blocks);
#else
(*loose_size) += xsize_t((st.st_size+511)/512);
#endif
}
if (bad) {
if (verbose) {