xnu-4903.241.1.tar.gz

[apple/xnu.git] / libkern / mkext.c

diff --git a/libkern/mkext.c b/libkern/mkext.c
index e1fc062e1853cf35a00b2b837b5c4958ece649d8..59634832a4edcded381023773949e935cccaefdc 100644 (file)
--- a/libkern/mkext.c
+++ b/libkern/mkext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2016 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -25,12 +25,13 @@
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
+#include <stdint.h> // For uintptr_t.
 #include <string.h>
 #include <libkern/mkext.h>
 
+
 #define BASE 65521L /* largest prime smaller than 65536 */
-#define NMAX 5000  
-// NMAX (was 5521) the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1
+#define NMAX 5552  // the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1
 
 #define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
 #define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
@@ -45,6 +46,7 @@ mkext_adler32(uint8_t *buf, int32_t len)
     unsigned long s2 = 0; // (adler >> 16) & 0xffff;
     int k;
 
+
     while (len > 0) {
         k = len < NMAX ? len : NMAX;
         len -= k;
@@ -80,7 +82,9 @@ mkext_adler32(uint8_t *buf, int32_t len)
 #define F         18    /* upper limit for match_length */
 #define THRESHOLD 2     /* encode string into position and length
                            if match_length is greater than this */
+#if !KERNEL
 #define NIL       N     /* index for root of binary search trees */
+#endif
 
 struct encode_state {
     /*