*** empty log message ***

3 files changed, 11 insertions, 4 deletions

diff --git a/Changes b/Changes
index fe6bb1e..4d9660d 100644
--- a/Changes
+++ b/Changes
@@ -10,6 +10,8 @@ TODO: allow size-optimised binaries by avoiding unrolling
           always < 64kb).
 	- use _WIN32, not WIN32, when testing for windows (fails with bcc),
           patch by Tamas Tevesz.
+        - try to port to win64+gcc, which is non-posix but has not _int64
+          (reported by Maciej Adamczyk).
 
 3.6  Mon Feb  7 17:37:31 CET 2011
 	- fixed hash calculation in C♯ version (Tiago Freitas Leal).
diff --git a/lzfP.h b/lzfP.h
index deac5ba..123a0e9 100644
--- a/lzfP.h
+++ b/lzfP.h
@@ -159,7 +159,7 @@ using namespace std;
 #endif
 
 #ifndef LZF_USE_OFFSETS
-# if defined (WIN32) || defined (_WIN32)
+# ifdef _WIN32
 #  define LZF_USE_OFFSETS defined(_M_X64)
 # else
 #  if __cplusplus > 199711L
diff --git a/lzf_c.c b/lzf_c.c
index b8155bf..101214f 100644
--- a/lzf_c.c
+++ b/lzf_c.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2010 Marc Alexander Lehmann <schmorp@schmorp.de>
+ * Copyright (c) 2000-2010,2012 Marc Alexander Lehmann <schmorp@schmorp.de>
  * 
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are met:
@@ -119,8 +119,13 @@ lzf_compress (const void *const in_data, unsigned int in_len,
    * and fails to support both assumptions is windows 64 bit, we make a
    * special workaround for it.
    */
-#if defined (WIN32) && defined (_M_X64)
-  unsigned _int64 off; /* workaround for missing POSIX compliance */
+#if defined (_WIN32) && defined (_M_X64)
+  /* workaround for missing POSIX compliance */
+  #if  #if __GNUC__
+    unsigned long long off;
+  #else
+    unsigned __int64 off;
+  #endif
 #else
   unsigned long off;
 #endif