Bug 1547639 - Automatic vendoring of zlib, r=jcj

Differential Revision: https://phabricator.services.mozilla.com/D58499

--HG--
extra : moz-landing-system : lando

lib/zlib/README.nss

@@ -9,10 +9,3 @@ Description:
 
 NSS uses zlib in libSSL (for the DEFLATE compression method), modutil, and
 signtool.
-
-Local Modifications:
-
-- patches/prune-zlib.sh: run this shell script to remove unneeded files
-  from the zlib distribution.
-- patches/msvc-vsnprintf.patch: define HAVE_VSNPRINTF for Visual C++ 2008
-  (9.0) and later.

lib/zlib/config.mk

@@ -8,13 +8,14 @@
 #  are specifed as dependencies within rules.mk.
 #
 
-TARGETS        = $(LIBRARY) $(PROGRAMS)
+TARGETS        = $(LIBRARY)
 SHARED_LIBRARY =
 IMPORT_LIBRARY =
 PROGRAM        =
 
 EXTRA_LIBS     = $(LIBRARY)
 
-ifeq ($(OS_TARGET),Linux)
+ifneq ($(OS_ARCH),WINNT)
 DEFINES += -DHAVE_UNISTD_H
 endif
+DEFINES += -DHAVE_STDARG_H