From 35b974146a85d53325ccaf46e84e5f144c241fe9 Mon Sep 17 00:00:00 2001
From: "nelson%bolyard.com"
 <nelson%bolyard.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 7 Nov 2009 01:13:31 +0000
Subject: [PATCH] Bug 491044: Remove support for VMS (a.k.a., OpenVMS) from
 NSS, r=rrelyea

git-svn-id: svn://10.0.0.236/trunk@258914 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/lib/zlib/README     |  2 +-
 mozilla/security/nss/lib/zlib/example.c  |  4 ++--
 mozilla/security/nss/lib/zlib/minigzip.c |  6 +-----
 mozilla/security/nss/lib/zlib/zconf.h    | 10 +---------
 mozilla/security/nss/lib/zlib/zutil.h    |  7 ++-----
 5 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/mozilla/security/nss/lib/zlib/README b/mozilla/security/nss/lib/zlib/README
index 758cc50020d..92639fcea00 100644
--- a/mozilla/security/nss/lib/zlib/README
+++ b/mozilla/security/nss/lib/zlib/README
@@ -17,7 +17,7 @@ minigzip.c.
 To compile all files and run the test program, follow the instructions given at
 the top of Makefile. In short "make test; make install" should work for most
 machines. For Unix: "./configure; make test; make install". For MSDOS, use one
-of the special makefiles such as Makefile.msc. For VMS, use make_vms.com.
+of the special makefiles such as Makefile.msc. 
 
 Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
 <info@winimage.com> for the Windows DLL version. The zlib home page is
diff --git a/mozilla/security/nss/lib/zlib/example.c b/mozilla/security/nss/lib/zlib/example.c
index a7d7da64590..ad7820caea5 100644
--- a/mozilla/security/nss/lib/zlib/example.c
+++ b/mozilla/security/nss/lib/zlib/example.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: example.c,v 1.5 2009-11-07 01:13:09 wtchang%redhat.com Exp $ */
+/* @(#) $Id: example.c,v 1.6 2009-11-07 01:13:10 nelson%bolyard.com Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
@@ -13,7 +13,7 @@
 #  include <stdlib.h>
 #endif
 
-#if defined(VMS) || defined(RISCOS)
+#if defined(RISCOS)
 #  define TESTFILE "foo-gz"
 #else
 #  define TESTFILE "foo.gz"
diff --git a/mozilla/security/nss/lib/zlib/minigzip.c b/mozilla/security/nss/lib/zlib/minigzip.c
index cc69b572112..9c4e243a640 100644
--- a/mozilla/security/nss/lib/zlib/minigzip.c
+++ b/mozilla/security/nss/lib/zlib/minigzip.c
@@ -13,7 +13,7 @@
  * or in pipe mode.
  */
 
-/* @(#) $Id: minigzip.c,v 1.5 2009-11-07 01:13:11 wtchang%redhat.com Exp $ */
+/* @(#) $Id: minigzip.c,v 1.6 2009-11-07 01:13:12 nelson%bolyard.com Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
@@ -37,10 +37,6 @@
 #  define SET_BINARY_MODE(file)
 #endif
 
-#ifdef VMS
-#  define unlink delete
-#  define GZ_SUFFIX "-gz"
-#endif
 #ifdef RISCOS
 #  define unlink remove
 #  define GZ_SUFFIX "-gz"
diff --git a/mozilla/security/nss/lib/zlib/zconf.h b/mozilla/security/nss/lib/zlib/zconf.h
index 502d65793ad..3645492929f 100644
--- a/mozilla/security/nss/lib/zlib/zconf.h
+++ b/mozilla/security/nss/lib/zlib/zconf.h
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: zconf.h,v 1.6 2009-11-07 01:13:11 wtchang%redhat.com Exp $ */
+/* @(#) $Id: zconf.h,v 1.7 2009-11-07 01:13:12 nelson%bolyard.com Exp $ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
@@ -284,14 +284,6 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
-#  endif
-#  define z_off_t off_t
-#endif
 #ifndef SEEK_SET
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
diff --git a/mozilla/security/nss/lib/zlib/zutil.h b/mozilla/security/nss/lib/zlib/zutil.h
index a4d6293e8bd..2590aad70dd 100644
--- a/mozilla/security/nss/lib/zlib/zutil.h
+++ b/mozilla/security/nss/lib/zlib/zutil.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: zutil.h,v 1.7 2009-11-07 01:13:11 julien.pierre.boogz%sun.com Exp $ */
+/* @(#) $Id: zutil.h,v 1.8 2009-11-07 01:13:12 nelson%bolyard.com Exp $ */
 
 #ifndef ZUTIL_H
 #define ZUTIL_H
@@ -105,7 +105,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define OS_CODE  0x01
 #endif
 
-#if defined(VAXC) || defined(VMS)
+#if defined(VAXC)
 #  define OS_CODE  0x02
 #  define F_OPEN(name, mode) \
      fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
@@ -205,9 +205,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #    define NO_vsnprintf
 #  endif
 #endif
-#ifdef VMS
-#  define NO_vsnprintf
-#endif
 
 #if defined(pyr)
 #  define NO_MEMCPY