You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/06/26 10:54:11 UTC

[tomcat-native] branch master updated: Revert accidental change

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/master by this push:
     new 9ff31c4  Revert accidental change
9ff31c4 is described below

commit 9ff31c42ec0477fe1b5f3c2f00fc2db1fbdb9fc6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 26 11:38:44 2019 +0100

    Revert accidental change
    
    I thought this lib may be required to resolve a compilation issue I was
    seeing but it is already included elsewhere in the make file
---
 native/NMAKEmakefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/native/NMAKEmakefile.inc b/native/NMAKEmakefile.inc
index ad752a9..b09c1d4 100644
--- a/native/NMAKEmakefile.inc
+++ b/native/NMAKEmakefile.inc
@@ -256,7 +256,7 @@ CXXFLAGS = $(EXTRA_CXXFLAGS)
 !ENDIF
 
 # Linker section
-LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib psapi.lib
+LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
 # Extra libs from command line or env
 !IF DEFINED(EXTRA_LIBS)
 LIBS = $(LIBS) $(EXTRA_LIBS)


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org