Skip to content

Commit b7037b6

Browse files
Ramsay Jonesgitster
authored andcommitted
msvc: git-daemon.exe: Fix linker "unresolved externals" error
The msvc linker complains about external symbols referenced by the new poll() emulation code. In particular, it complains about the DispatchMessage(), PeekMessage(), TranslateMessage() and MsgWaitForMultipleObjects() functions. In order to satisfy the external references, we link against the user32.lib library. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 56fb3dd commit b7037b6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ ifeq ($(uname_S),Windows)
10871087
COMPAT_OBJS = compat/msvc.o compat/fnmatch/fnmatch.o compat/winansi.o compat/win32/pthread.o compat/win32/syslog.o compat/win32/sys/poll.o
10881088
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/fnmatch -Icompat/regex -Icompat/fnmatch -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
10891089
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
1090-
EXTLIBS = advapi32.lib shell32.lib wininet.lib ws2_32.lib
1090+
EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib
10911091
PTHREAD_LIBS =
10921092
lib =
10931093
ifndef DEBUG

0 commit comments

Comments
 (0)