Remove NSPR20 #ifdefs

git-svn-id: svn://10.0.0.236/trunk@13115 18797224-902f-48f8-a5cc-f745e15eee43

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))

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() */