diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-08-26 23:16:37 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-08-26 23:16:37 +0000 |
| commit | 4c7f40f3f553696796f2889ee5d31bd611c428a1 (patch) | |
| tree | 1eb533e0256093ff5a077cc1cf7975749138b833 /Makefile.nmake | |
| parent | 228bc22aa91706886b8a691a8c38b17f3ddffea2 (diff) | |
Add a compile-time option to use a separate thread for reading from
pipes. Enable this by default on Windows. Remove code that tried to
use WaitForSingleObject on a pipe (which Windows doesn't support). Use
native file handles and system calls on Windows (which fixes a problem
with partial reads I ran into during testing).
This should fix bug 1759.
svn path=/trunk/; revision=29574
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index ccfc26ad0a..161b626f0c 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -159,6 +159,7 @@ dumpcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) \ + $(GTHREAD_LIBS) \ $(GNUTLS_LIBS) dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ @@ -1043,6 +1044,7 @@ install-all: install-generated-files xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL_DIR) /d xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d + xcopy $(GLIB_DIR)\bin\libgthread-2.0-0.dll $(INSTALL_DIR) /d !IFDEF ICONV_DIR xcopy $(ICONV_DIR)\bin\iconv.dll $(INSTALL_DIR) /d !ENDIF |