mirror of
https://github.com/git/git.git
synced 2024-11-14 13:13:01 +01:00
435bdf8c7f
Centralize the include of windows.h in git-compat-util.h, turn on WIN32_LEAN_AND_MEAN to avoid including plenty of other header files which is not needed in Git. Also ensure we load winsock2.h first, so we don't load the older winsock definitions at a later stage, since they contain duplicate definitions. When moving windows.h into git-compat-util.h, we need to protect the definition of struct pollfd in mingw.h, since this file is used by both MinGW and MSVC, and the latter defines this struct in winsock2.h. We need to keep the windows.h include in compat/win32.h, since its shared by both MinGW and Cygwin, and we're not touching Cygwin in this commit. The include in git-compat-util.h is protected with an ifdef WIN32, which is not the case when compiling for Cygwin. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
41 lines
872 B
C
41 lines
872 B
C
#ifndef WIN32_H
|
|
#define WIN32_H
|
|
|
|
/* common Win32 functions for MinGW and Cygwin */
|
|
#ifndef WIN32 /* Not defined by Cygwin */
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
static inline int file_attr_to_st_mode (DWORD attr)
|
|
{
|
|
int fMode = S_IREAD;
|
|
if (attr & FILE_ATTRIBUTE_DIRECTORY)
|
|
fMode |= S_IFDIR;
|
|
else
|
|
fMode |= S_IFREG;
|
|
if (!(attr & FILE_ATTRIBUTE_READONLY))
|
|
fMode |= S_IWRITE;
|
|
return fMode;
|
|
}
|
|
|
|
static inline int get_file_attr(const char *fname, WIN32_FILE_ATTRIBUTE_DATA *fdata)
|
|
{
|
|
if (GetFileAttributesExA(fname, GetFileExInfoStandard, fdata))
|
|
return 0;
|
|
|
|
switch (GetLastError()) {
|
|
case ERROR_ACCESS_DENIED:
|
|
case ERROR_SHARING_VIOLATION:
|
|
case ERROR_LOCK_VIOLATION:
|
|
case ERROR_SHARING_BUFFER_EXCEEDED:
|
|
return EACCES;
|
|
case ERROR_BUFFER_OVERFLOW:
|
|
return ENAMETOOLONG;
|
|
case ERROR_NOT_ENOUGH_MEMORY:
|
|
return ENOMEM;
|
|
default:
|
|
return ENOENT;
|
|
}
|
|
}
|
|
|
|
#endif
|