Changeset - r12741:8667e369bdf5
Parent rev.
Child rev.
[Not reviewed]
master
0 2 0
rubidium - 15 years ago 2009-08-18 22:51:43
rubidium@openttd.org
(svn r17217) -Fix (r17216): silence some warnings for the more exotic GCC-alikes
2 files changed with 17 insertions and 17 deletions:
src/3rdparty/minilzo/lzodefs.h
15
15
src/3rdparty/minilzo/minilzo.c
2
2
0 comments (0 inline, 0 general)
src/3rdparty/minilzo/lzodefs.h
➞
Show inline comments
 
@@ -1309,223 +1309,223 @@ extern "C" {
 
#  define LZO_LIBC_NEWLIB       1
 
#  define LZO_INFO_LIBC         "newlib"
 
#elif defined(__UCLIBC__) && defined(__UCLIBC_MAJOR__) && defined(__UCLIBC_MINOR__)
 
#  if defined(__UCLIBC_SUBLEVEL__)
 
#    define LZO_LIBC_UCLIBC     (__UCLIBC_MAJOR__ * 0x10000L + __UCLIBC_MINOR__ * 0x100 + __UCLIBC_SUBLEVEL__)
 
#  else
 
#    define LZO_LIBC_UCLIBC     0x00090bL
 
#  endif
 
#  define LZO_INFO_LIBC         "uclibc"
 
#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)
 
#  define LZO_LIBC_GLIBC        (__GLIBC__ * 0x10000L + __GLIBC_MINOR__ * 0x100)
 
#  define LZO_INFO_LIBC         "glibc"
 
#elif defined(LZO_CC_MWERKS) && defined(__MSL__)
 
#  define LZO_LIBC_MSL          __MSL__
 
#  define LZO_INFO_LIBC         "msl"
 
#elif 1 && defined(__IAR_SYSTEMS_ICC__)
 
#  define LZO_LIBC_ISOC90       1
 
#  define LZO_INFO_LIBC         "isoc90"
 
#else
 
#  define LZO_LIBC_DEFAULT      1
 
#  define LZO_INFO_LIBC         "default"
 
#endif
 
#endif
 
#if !defined(__lzo_gnuc_extension__)
 
#if (LZO_CC_GNUC >= 0x020800ul)
 
#if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x020800ul)
 
#  define __lzo_gnuc_extension__    __extension__
 
#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
 
#elif defined(LZO_CC_LLVM) || defined(LZO_CC_PATHSCALE)
 
#  define __lzo_gnuc_extension__    __extension__
 
#else
 
#  define __lzo_gnuc_extension__
 
#endif
 
#endif
 
#if !defined(__lzo_ua_volatile)
 
#  define __lzo_ua_volatile     volatile
 
#endif
 
#if !defined(__lzo_alignof)
 
#if defined(LZO_CC_CILLY) || defined(LZO_CC_GNUC) || defined(LZO_CC_LLVM) || defined(LZO_CC_PATHSCALE) || defined(LZO_CC_PGI)
 
#  define __lzo_alignof(e)      __alignof__(e)
 
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 700)
 
#  define __lzo_alignof(e)      __alignof__(e)
 
#elif defined(LZO_CC_MSC) && (_MSC_VER >= 1300)
 
#  define __lzo_alignof(e)      __alignof(e)
 
#endif
 
#endif
 
#if defined(__lzo_alignof)
 
#  define __lzo_HAVE_alignof 1
 
#endif
 
#if !defined(__lzo_constructor)
 
#if (LZO_CC_GNUC >= 0x030400ul)
 
#if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x030400ul)
 
#  define __lzo_constructor     __attribute__((__constructor__,__used__))
 
#elif (LZO_CC_GNUC >= 0x020700ul)
 
#elif defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x020700ul)
 
#  define __lzo_constructor     __attribute__((__constructor__))
 
#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
 
#elif defined(LZO_CC_LLVM) || defined(LZO_CC_PATHSCALE)
 
#  define __lzo_constructor     __attribute__((__constructor__))
 
#endif
 
#endif
 
#if defined(__lzo_constructor)
 
#  define __lzo_HAVE_constructor 1
 
#endif
 
#if !defined(__lzo_destructor)
 
#if (LZO_CC_GNUC >= 0x030400ul)
 
#if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x030400ul)
 
#  define __lzo_destructor      __attribute__((__destructor__,__used__))
 
#elif (LZO_CC_GNUC >= 0x020700ul)
 
#elif defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x020700ul)
 
#  define __lzo_destructor      __attribute__((__destructor__))
 
#elif (LZO_CC_LLVM || LZO_CC_PATHSCALE)
 
#elif defined(LZO_CC_LLVM) || defined(LZO_CC_PATHSCALE)
 
#  define __lzo_destructor      __attribute__((__destructor__))
 
#endif
 
#endif
 
#if defined(__lzo_destructor)
 
#  define __lzo_HAVE_destructor 1
 
#endif
 
#if defined(__lzo_HAVE_destructor) && !defined(__lzo_HAVE_constructor)
 
#  error "this should not happen"
 
#endif
 
#if !defined(__lzo_inline)
 
#if defined(LZO_CC_TURBOC) && (__TURBOC__ <= 0x0295)
 
#elif defined(__cplusplus)
 
#  define __lzo_inline          inline
 
#elif defined(LZO_CC_BORLANDC) && (__BORLANDC__ >= 0x0550)
 
#  define __lzo_inline          __inline
 
#elif defined(LZO_CC_CILLY) || defined(LZO_CC_GNUC) || defined(LZO_CC_LLVM) || defined(LZO_CC_PATHSCALE) || defined(LZO_CC_PGI)
 
#  define __lzo_inline          __inline__
 
#elif defined(LZO_CC_DMC)
 
#  define __lzo_inline          __inline
 
#elif defined(LZO_CC_INTELC)
 
#  define __lzo_inline          __inline
 
#elif defined(LZO_CC_MWERKS) && (__MWERKS__ >= 0x2405)
 
#  define __lzo_inline          __inline
 
#elif defined(LZO_CC_MSC) && (_MSC_VER >= 900)
 
#  define __lzo_inline          __inline
 
#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
 
#  define __lzo_inline          inline
 
#endif
 
#endif
 
#if defined(__lzo_inline)
 
#  define __lzo_HAVE_inline 1
 
#else
 
#  define __lzo_inline
 
#endif
 
#if !defined(__lzo_forceinline)
 
#if (LZO_CC_GNUC >= 0x030200ul)
 
#if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x030200ul)
 
#  define __lzo_forceinline     __inline__ __attribute__((__always_inline__))
 
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 450) && defined(LZO_CC_SYNTAX_MSC)
 
#  define __lzo_forceinline     __forceinline
 
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 800) && defined(LZO_CC_SYNTAX_GNUC)
 
#  define __lzo_forceinline     __inline__ __attribute__((__always_inline__))
 
#elif defined(LZO_CC_LLVM) || defined(LZO_CC_PATHSCALE)
 
#  define __lzo_forceinline     __inline__ __attribute__((__always_inline__))
 
#elif defined(LZO_CC_MSC) && (_MSC_VER >= 1200)
 
#  define __lzo_forceinline     __forceinline
 
#endif
 
#endif
 
#if defined(__lzo_forceinline)
 
#  define __lzo_HAVE_forceinline 1
 
#else
 
#  define __lzo_forceinline
 
#endif
 
#if !defined(__lzo_noinline)
 
#if 1 && defined(LZO_ARCH_I386) && (LZO_CC_GNUC >= 0x040000ul) && (LZO_CC_GNUC < 0x040003ul)
 
#  define __lzo_noinline        __attribute__((__noinline__,__used__))
 
#elif (LZO_CC_GNUC >= 0x030200ul)
 
#elif defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x030200ul)
 
#  define __lzo_noinline        __attribute__((__noinline__))
 
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 600) && defined(LZO_CC_SYNTAX_MSC)
 
#  define __lzo_noinline        __declspec(noinline)
 
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 800) && defined(LZO_CC_SYNTAX_GNUC)
 
#  define __lzo_noinline        __attribute__((__noinline__))
 
#elif defined(LZO_CC_LLVM) || defined(LZO_CC_PATHSCALE)
 
#  define __lzo_noinline        __attribute__((__noinline__))
 
#elif defined(LZO_CC_MSC) && (_MSC_VER >= 1300)
 
#  define __lzo_noinline        __declspec(noinline)
 
#elif defined(LZO_CC_MWERKS) && (__MWERKS__ >= 0x3200) && (defined(LZO_OS_WIN32) || (defined(LZO_OS_WIN64))
 
#elif defined(LZO_CC_MWERKS) && (__MWERKS__ >= 0x3200) && (defined(LZO_OS_WIN32) || (defined(LZO_OS_WIN64)))
 
#  if defined(__cplusplus)
 
#  else
 
#    define __lzo_noinline      __declspec(noinline)
 
#  endif
 
#endif
 
#endif
 
#if defined(__lzo_noinline)
 
#  define __lzo_HAVE_noinline 1
 
#else
 
#  define __lzo_noinline
 
#endif
 
#if (defined(__lzo_HAVE_forceinline) || defined(__lzo_HAVE_noinline)) && !defined(__lzo_HAVE_inline)
 
#  error "this should not happen"
 
#endif
 
#if !defined(__lzo_noreturn)
 
#if (LZO_CC_GNUC >= 0x020700ul)
 
#if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x020700ul)
 
#  define __lzo_noreturn        __attribute__((__noreturn__))
 
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 450) && defined(LZO_CC_SYNTAX_MSC)
 
#  define __lzo_noreturn        __declspec(noreturn)
 
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 600) && defined(LZO_CC_SYNTAX_GNUC)
 
#  define __lzo_noreturn        __attribute__((__noreturn__))
 
#elif defined(LZO_CC_LLVM) || defined(LZO_CC_PATHSCALE)
 
#  define __lzo_noreturn        __attribute__((__noreturn__))
 
#elif defined(LZO_CC_MSC) && (_MSC_VER >= 1200)
 
#  define __lzo_noreturn        __declspec(noreturn)
 
#endif
 
#endif
 
#if defined(__lzo_noreturn)
 
#  define __lzo_HAVE_noreturn 1
 
#else
 
#  define __lzo_noreturn
 
#endif
 
#if !defined(__lzo_nothrow)
 
#if (LZO_CC_GNUC >= 0x030300ul)
 
#if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x030300ul)
 
#  define __lzo_nothrow         __attribute__((__nothrow__))
 
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 450) && defined(LZO_CC_SYNTAX_MSC) && defined(__cplusplus)
 
#  define __lzo_nothrow         __declspec(nothrow)
 
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 800) && defined(LZO_CC_SYNTAX_GNUC)
 
#  define __lzo_nothrow         __attribute__((__nothrow__))
 
#elif defined(LZO_CC_LLVM) || defined(LZO_CC_PATHSCALE)
 
#  define __lzo_nothrow         __attribute__((__nothrow__))
 
#elif defined(LZO_CC_MSC) && (_MSC_VER >= 1200) && defined(__cplusplus)
 
#  define __lzo_nothrow         __declspec(nothrow)
 
#endif
 
#endif
 
#if defined(__lzo_nothrow)
 
#  define __lzo_HAVE_nothrow 1
 
#else
 
#  define __lzo_nothrow
 
#endif
 
#if !defined(__lzo_restrict)
 
#if (LZO_CC_GNUC >= 0x030400ul)
 
#if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x030400ul)
 
#  define __lzo_restrict        __restrict__
 
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 600) && defined(LZO_CC_SYNTAX_GNUC)
 
#  define __lzo_restrict        __restrict__
 
#elif defined(LZO_CC_LLVM)
 
#  define __lzo_restrict        __restrict__
 
#elif defined(LZO_CC_MSC) && (_MSC_VER >= 1400)
 
#  define __lzo_restrict        __restrict
 
#endif
 
#endif
 
#if defined(__lzo_restrict)
 
#  define __lzo_HAVE_restrict 1
 
#else
 
#  define __lzo_restrict
 
#endif
 
#if !defined(__lzo_likely) && !defined(__lzo_unlikely)
 
#if (LZO_CC_GNUC >= 0x030200ul)
 
#if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x030200ul)
 
#  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
 
#  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
 
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 800)
 
#  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
 
#  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
 
#elif defined(LZO_CC_LLVM) || defined(LZO_CC_PATHSCALE)
 
#  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
 
#  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
 
#endif
 
#endif
 
#if defined(__lzo_likely)
 
#  define __lzo_HAVE_likely 1
 
#else
 
#  define __lzo_likely(e)       (e)
 
#endif
 
#if defined(__lzo_unlikely)
 
#  define __lzo_HAVE_unlikely 1
 
#else
 
#  define __lzo_unlikely(e)     (e)
 
#endif
 
#if !defined(LZO_UNUSED)
 
#  if defined(LZO_CC_BORLANDC) && (__BORLANDC__ >= 0x0600)
 
#    define LZO_UNUSED(var)         ((void) &var)
 
#  elif defined(LZO_CC_BORLANDC) || defined(LZO_CC_HIGHC) || defined(LZO_CC_NDPC) || defined(LZO_CC_PELLESC) || defined(LZO_CC_TURBOC)
src/3rdparty/minilzo/minilzo.c
➞
Show inline comments
 
@@ -1904,49 +1904,49 @@ extern "C" {
 
#else
 
#  define ACC_WANT_ACC_INCD_H 1
 
#endif
 

			




	
	
	
		
 
#if defined(LZO_ARCH_I086)

			




	
	
	
		
 
#  define ACC_MM_AHSHIFT        LZO_MM_AHSHIFT

			




	
	
	
		
 
#  define ACC_PTR_FP_OFF(x)     (((const unsigned __far*)&(x))[0])

			




	
	
	
		
 
#  define ACC_PTR_FP_SEG(x)     (((const unsigned __far*)&(x))[1])

			




	
	
	
		
 
#  define ACC_PTR_MK_FP(s,o)    ((void __far*)(((unsigned long)(s)<<16)+(unsigned)(o)))

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
#if !defined(lzo_uintptr_t)

			




	
	
	
		
 
#  if defined(__LZO_MMODEL_HUGE)

			




	
	
	
		
 
#    define lzo_uintptr_t       unsigned long

			




	
	
	
		
 
#  elif 1 && defined(LZO_OS_OS400) && (LZO_SIZEOF_VOID_P == 16)

			




	
	
	
		
 
#    define __LZO_UINTPTR_T_IS_POINTER 1

			




	
	
	
		
 
     typedef char*              lzo_uintptr_t;

			




	
	
	
		
 
#    define lzo_uintptr_t       lzo_uintptr_t

			




	
	
	
		
 
#  elif (LZO_SIZEOF_SIZE_T == LZO_SIZEOF_VOID_P)

			




	
	
	
		
 
#    define lzo_uintptr_t       size_t

			




	
	
	
		
 
#  elif (LZO_SIZEOF_LONG == LZO_SIZEOF_VOID_P)

			




	
	
	
		
 
#    define lzo_uintptr_t       unsigned long

			




	
	
	
		
 
#  elif (LZO_SIZEOF_INT == LZO_SIZEOF_VOID_P)

			




	
	
	
		
 
#    define lzo_uintptr_t       unsigned int

			




	
	
	
		
 
#  elif (LZO_SIZEOF_LONG_LONG == LZO_SIZEOF_VOID_P)

			




	
	
	
		
 
#  elif defined(LZO_SIZEOF_LONG_LONG) && (LZO_SIZEOF_LONG_LONG == LZO_SIZEOF_VOID_P)

			




	
	
	
		
 
#    define lzo_uintptr_t       unsigned long long

			




	
	
	
		
 
#  else

			




	
	
	
		
 
#    define lzo_uintptr_t       size_t

			




	
	
	
		
 
#  endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 
//LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uintptr_t) >= sizeof(lzo_voidp))

			




	
	
	
		
 

			




	
	
	
		
 
#if 1 && !defined(LZO_CFG_FREESTANDING)

			




	
	
	
		
 
#if 1 && !defined(HAVE_STRING_H)

			




	
	
	
		
 
#define HAVE_STRING_H 1

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#if 1 && !defined(HAVE_MEMCMP)

			




	
	
	
		
 
#define HAVE_MEMCMP 1

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#if 1 && !defined(HAVE_MEMCPY)

			




	
	
	
		
 
#define HAVE_MEMCPY 1

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#if 1 && !defined(HAVE_MEMMOVE)

			




	
	
	
		
 
#define HAVE_MEMMOVE 1

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#if 1 && !defined(HAVE_MEMSET)

			




	
	
	
		
 
#define HAVE_MEMSET 1

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
		
 
@@ -2460,49 +2460,49 @@ LZO_PUBLIC(int)

			




	
	
	
		
 
    p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0];

			




	
	
	
		
 
    u.l[0] = u.l[1] = 0;

			




	
	
	
		
 
    r &= ((* (const lzo_ushortp) (p+1)) == 0);

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#if defined(LZO_UNALIGNED_OK_4)

			




	
	
	
		
 
    p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0];

			




	
	
	
		
 
    u.l[0] = u.l[1] = 0;

			




	
	
	
		
 
    r &= ((* (const lzo_uint32p) (p+1)) == 0);

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
    LZO_UNUSED(u); LZO_UNUSED(p);

			




	
	
	
		
 
    return r == 1 ? LZO_E_OK : LZO_E_ERROR;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
int __lzo_init_done = 0;

			




	
	
	
		
 

			




	
	
	
		
 
LZO_PUBLIC(int)

			




	
	
	
		
 
__lzo_init_v2(unsigned v, int s1, int s2, int s3, int s4, int s5,

			




	
	
	
		
 
                          int s6, int s7, int s8, int s9)

			




	
	
	
		
 
{

			




	
	
	
		
 
    int r;

			




	
	
	
		
 

			




	
	
	
		
 
#if defined(__LZO_IN_MINILZO)

			




	
	
	
		
 
#elif (LZO_CC_MSC && ((_MSC_VER) < 700))

			




	
	
	
		
 
#elif defined(LZO_CC_MSC) && ((_MSC_VER) < 700)

			




	
	
	
		
 
#else

			




	
	
	
		
 
#define ACC_WANT_ACC_CHK_CH 1

			




	
	
	
		
 
#undef ACCCHK_ASSERT

			




	
	
	
		
 
#define ACCCHK_ASSERT(expr)  LZO_COMPILE_TIME_ASSERT(expr)

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#undef ACCCHK_ASSERT

			




	
	
	
		
 

			




	
	
	
		
 
    __lzo_init_done = 1;

			




	
	
	
		
 

			




	
	
	
		
 
    if (v == 0)

			




	
	
	
		
 
        return LZO_E_ERROR;

			




	
	
	
		
 

			




	
	
	
		
 
    r = (s1 == -1 || s1 == (int) sizeof(short)) &&

			




	
	
	
		
 
        (s2 == -1 || s2 == (int) sizeof(int)) &&

			




	
	
	
		
 
        (s3 == -1 || s3 == (int) sizeof(long)) &&

			




	
	
	
		
 
        (s4 == -1 || s4 == (int) sizeof(lzo_uint32)) &&

			




	
	
	
		
 
        (s5 == -1 || s5 == (int) sizeof(lzo_uint)) &&

			




	
	
	
		
 
        (s6 == -1 || s6 == (int) lzo_sizeof_dict_t) &&

			




	
	
	
		
 
        (s7 == -1 || s7 == (int) sizeof(char *)) &&

			




	
	
	
		
 
        (s8 == -1 || s8 == (int) sizeof(lzo_voidp)) &&

			




	
	
	
		
 
        (s9 == -1 || s9 == (int) sizeof(lzo_callback_t));

			




	
	
	
		
 
    if (!r)

			




	
	
	
		
 
        return LZO_E_ERROR;

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support