diff --git a/mozilla/js/src/liveconnect/jsj_hash.c b/mozilla/js/src/liveconnect/jsj_hash.c index 4579c9e0780..be31cbe7f41 100644 --- a/mozilla/js/src/liveconnect/jsj_hash.c +++ b/mozilla/js/src/liveconnect/jsj_hash.c @@ -31,12 +31,8 @@ #include "jsj_hash.h" #include "prtypes.h" -#ifdef NSPR20 # include "prlog.h" # include "prbit.h" -#else -# include "prassert.h" -#endif /* Compute the number of buckets in ht */ #define NBUCKETS(ht) (1 << (JSJ_HASH_BITS - (ht)->shift)) diff --git a/mozilla/js/src/liveconnect/jsj_private.h b/mozilla/js/src/liveconnect/jsj_private.h index 06c7d0389b7..3a0ceb2b3bb 100644 --- a/mozilla/js/src/liveconnect/jsj_private.h +++ b/mozilla/js/src/liveconnect/jsj_private.h @@ -31,17 +31,9 @@ #include "prtypes.h" -/* NSPR1 compatibility definitions */ -#ifdef NSPR20 # include "prprf.h" # include "prlog.h" # include "plhash.h" /* NSPR hash-tables */ -#else -# include "prprintf.h" -# include "prassert.h" -# include "prhash.h" /* NSPR hash-tables */ -# define PRHashNumber prhashcode -#endif #ifdef XP_MAC #include "macstdlibextras.h" /* for strdup() */