Changeset 3620 in vbox

Timestamp:

Jul 15, 2007 7:26:52 PM (17 years ago)

Author:

vboxsync

Message:

I hope this is it...

Location:

trunk/src/libs/liblzf-1.51

Files:

• Makefile.kmk (modified) (1 diff)
• lzf_c.c (modified) (2 diffs)

trunk/src/libs/liblzf-1.51/Makefile.kmk

@@ -25 +25 @@
 VBox-liblzf_TEMPLATE = VBOXR3
 VBox-liblzf_DEFS = ULTRA_FAST #HLOG=14
+VBox-liblzf_DEFS.win.amd64 = USE_UINTPTR_T=1
 VBox-liblzf_SOURCES= \
         lzf_c.c \

trunk/src/libs/liblzf-1.51/lzf_c.c

@@ -39 +39 @@
 #include "lzfP.h"
 #ifdef VBOX
-#include "lzf.h"
+# include "lzf.h"
+#endif
+#ifdef USE_UINTPTR_T /* bird: use intptr_t for pointer acrobatics on 64-bit windows. */
+# if defined(_MSC_VER)
+#  include <crtdefs.h>
+# else
+#  include <stdint.h>
+# endif
 #endif
 
@@ -103 +110 @@
 
   unsigned int hval = FRST (ip);
+#ifdef USE_UINTPTR_T /* bird: use intptr_t for pointer acrobatics on 64-bit windows. */
+  uintptr_t off;
+#else
   unsigned long off;
+#endif
            int lit = 0;