diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 21:42:07 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 21:42:07 +0200 |
| commit | 21c3e54010129b504891e1786bf425d89328c969 (patch) | |
| tree | 2e3eba26f5f0fa454188e1b52c7cab3761c4f208 /lzo/src/lzo_ptr.h | |
| parent | d4a1b52faa85df4446560a48c6bcc57f016e0c3c (diff) | |
| parent | b42eacfa8da0a642d629714f188cc0fc4c7e601a (diff) | |
Merge
Diffstat (limited to 'lzo/src/lzo_ptr.h')
| -rw-r--r-- | lzo/src/lzo_ptr.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lzo/src/lzo_ptr.h b/lzo/src/lzo_ptr.h index e286a702..6aa1fc84 100644 --- a/lzo/src/lzo_ptr.h +++ b/lzo/src/lzo_ptr.h @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -45,7 +48,7 @@ #ifndef __LZO_PTR_H -#define __LZO_PTR_H +#define __LZO_PTR_H 1 #ifdef __cplusplus extern "C" { @@ -57,7 +60,7 @@ extern "C" { ************************************************************************/ #if !defined(lzo_uintptr_t) -# if defined(__LZO_MMODEL_HUGE) +# if (__LZO_MMODEL_HUGE) # define lzo_uintptr_t unsigned long # else # define lzo_uintptr_t acc_uintptr_t @@ -72,7 +75,7 @@ extern "C" { // ************************************************************************/ -/* Always use the safe (=integral) version for pointer-comparisions. +/* Always use the safe (=integral) version for pointer-comparisons. * The compiler should optimize away the additional casts anyway. * * Note that this only works if the representation and ordering @@ -125,6 +128,10 @@ typedef union lzo_uint a_lzo_uint; lzo_int32 a_lzo_int32; lzo_uint32 a_lzo_uint32; +#if defined(LZO_UINT64_MAX) + lzo_int64 a_lzo_int64; + lzo_uint64 a_lzo_uint64; +#endif ptrdiff_t a_ptrdiff_t; lzo_uintptr_t a_lzo_uintptr_t; lzo_voidp a_lzo_voidp; |