Merge branch 'sp/pack-protocol-doc-on-shallow' into maint

diff --git a/compat/win32/dirent.h b/compat/win32/dirent.h
index b38973b051a4ac79e45ff61a9755b491193b3089..058207e4bfed628376d94f8002278317b5c65074 100644 (file)
--- a/compat/win32/dirent.h
+++ b/compat/win32/dirent.h
@@ -9,11 +9,8 @@ typedef struct DIR DIR;
 #define DT_LNK     3
 
 struct dirent {
-       char d_name[FILENAME_MAX];       /* File name. */
-       union {
-               unsigned short d_reclen; /* Always zero. */
-               unsigned char  d_type;   /* Reimplementation adds this */
-       };
+       unsigned char d_type;      /* file type to prevent lstat after readdir */
+       char d_name[MAX_PATH * 3]; /* file name (* 3 for UTF-8 conversion) */
 };
 
 DIR *opendir(const char *dirname);