Skip to content
  • Marius Storm-Olsen's avatar
    Make usage of windows.h lean and mean · 435bdf8c
    Marius Storm-Olsen authored and Junio C Hamano's avatar Junio C Hamano committed
    
    
    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: default avatarMarius Storm-Olsen <mstormo@gmail.com>
    Acked-by: default avatarJohannes Sixt <j6t@kdbg.org>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    435bdf8c