bug 70992 patches to build 4.2 BSD

security/nss/lib/freebl/mpi/mpi.h

@@ -36,7 +36,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- *  $Id: mpi.h,v 1.18 2000/12/29 01:01:34 nelsonb%netscape.com Exp $
+ *  $Id: mpi.h,v 1.19 2001/03/13 19:01:52 relyea%netscape.com Exp $
  */
 
 #ifndef _H_MPI_
@@ -55,6 +55,11 @@
 #endif
 
 #include <limits.h>
+
+#if defined(BSDI)
+#undef ULLONG_MAX
+#endif
+
 #ifdef macintosh
 #include <Types.h>
 #else

security/nss/lib/ssl/unix_err.c

@@ -38,7 +38,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: unix_err.c,v 1.2 2000/09/18 19:53:59 nelsonb%netscape.com Exp $
+ * $Id: unix_err.c,v 1.3 2001/03/13 19:02:05 relyea%netscape.com Exp $
  */
 
 #if 0
@@ -48,6 +48,10 @@
 #include "prerror.h"
 #endif
 
+#if defined (__bsdi__)
+#undef _PR_POLL_AVAILABLE
+#endif
+
 #if defined(_PR_POLL_AVAILABLE)
 #include <poll.h>
 #endif