Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17217) -Fix (r17216): silence some warnings for the more exotic GCC-alikes

Browse Source
This commit is contained in:
rubidium 2009-08-18 22:51:43 +00:00
parent 5e40d05c51
commit 2568643418
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/3rdparty/minilzo/lzodefs.h vendored
View File

@ -1330,9 +1330,9 @@ extern "C" {
#endif #endif
#endif #endif
#if !defined(__lzo_gnuc_extension__) #if !defined(__lzo_gnuc_extension__)
#if (LZO_CC_GNUC >= 0x020800ul) #if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x020800ul)
# define __lzo_gnuc_extension__ __extension__ # 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__ # define __lzo_gnuc_extension__ __extension__
#else #else
# define __lzo_gnuc_extension__ # define __lzo_gnuc_extension__
@ -1354,11 +1354,11 @@ extern "C" {
# define __lzo_HAVE_alignof 1 # define __lzo_HAVE_alignof 1
#endif #endif
#if !defined(__lzo_constructor) #if !defined(__lzo_constructor)
#if (LZO_CC_GNUC >= 0x030400ul) #if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x030400ul)
# define __lzo_constructor __attribute__((__constructor__,__used__)) # 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__)) # 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__)) # define __lzo_constructor __attribute__((__constructor__))
#endif #endif
#endif #endif
@ -1366,11 +1366,11 @@ extern "C" {
# define __lzo_HAVE_constructor 1 # define __lzo_HAVE_constructor 1
#endif #endif
#if !defined(__lzo_destructor) #if !defined(__lzo_destructor)
#if (LZO_CC_GNUC >= 0x030400ul) #if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x030400ul)
# define __lzo_destructor __attribute__((__destructor__,__used__)) # 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__)) # 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__)) # define __lzo_destructor __attribute__((__destructor__))
#endif #endif
#endif #endif
@ -1406,7 +1406,7 @@ extern "C" {
# define __lzo_inline # define __lzo_inline
#endif #endif
#if !defined(__lzo_forceinline) #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__)) # define __lzo_forceinline __inline__ __attribute__((__always_inline__))
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 450) && defined(LZO_CC_SYNTAX_MSC) #elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 450) && defined(LZO_CC_SYNTAX_MSC)
# define __lzo_forceinline __forceinline # define __lzo_forceinline __forceinline
@ -1426,7 +1426,7 @@ extern "C" {
#if !defined(__lzo_noinline) #if !defined(__lzo_noinline)
#if 1 && defined(LZO_ARCH_I386) && (LZO_CC_GNUC >= 0x040000ul) && (LZO_CC_GNUC < 0x040003ul) #if 1 && defined(LZO_ARCH_I386) && (LZO_CC_GNUC >= 0x040000ul) && (LZO_CC_GNUC < 0x040003ul)
# define __lzo_noinline __attribute__((__noinline__,__used__)) # 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__)) # define __lzo_noinline __attribute__((__noinline__))
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 600) && defined(LZO_CC_SYNTAX_MSC) #elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 600) && defined(LZO_CC_SYNTAX_MSC)
# define __lzo_noinline __declspec(noinline) # define __lzo_noinline __declspec(noinline)
@ -1436,7 +1436,7 @@ extern "C" {
# define __lzo_noinline __attribute__((__noinline__)) # define __lzo_noinline __attribute__((__noinline__))
#elif defined(LZO_CC_MSC) && (_MSC_VER >= 1300) #elif defined(LZO_CC_MSC) && (_MSC_VER >= 1300)
# define __lzo_noinline __declspec(noinline) # 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) # if defined(__cplusplus)
# else # else
# define __lzo_noinline __declspec(noinline) # define __lzo_noinline __declspec(noinline)
@ -1452,7 +1452,7 @@ extern "C" {
# error "this should not happen" # error "this should not happen"
#endif #endif
#if !defined(__lzo_noreturn) #if !defined(__lzo_noreturn)
#if (LZO_CC_GNUC >= 0x020700ul) #if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x020700ul)
# define __lzo_noreturn __attribute__((__noreturn__)) # define __lzo_noreturn __attribute__((__noreturn__))
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 450) && defined(LZO_CC_SYNTAX_MSC) #elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 450) && defined(LZO_CC_SYNTAX_MSC)
# define __lzo_noreturn __declspec(noreturn) # define __lzo_noreturn __declspec(noreturn)
@ -1470,7 +1470,7 @@ extern "C" {
# define __lzo_noreturn # define __lzo_noreturn
#endif #endif
#if !defined(__lzo_nothrow) #if !defined(__lzo_nothrow)
#if (LZO_CC_GNUC >= 0x030300ul) #if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x030300ul)
# define __lzo_nothrow __attribute__((__nothrow__)) # define __lzo_nothrow __attribute__((__nothrow__))
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 450) && defined(LZO_CC_SYNTAX_MSC) && defined(__cplusplus) #elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 450) && defined(LZO_CC_SYNTAX_MSC) && defined(__cplusplus)
# define __lzo_nothrow __declspec(nothrow) # define __lzo_nothrow __declspec(nothrow)
@ -1488,7 +1488,7 @@ extern "C" {
# define __lzo_nothrow # define __lzo_nothrow
#endif #endif
#if !defined(__lzo_restrict) #if !defined(__lzo_restrict)
#if (LZO_CC_GNUC >= 0x030400ul) #if defined(LZO_CC_GNUC) && (LZO_CC_GNUC >= 0x030400ul)
# define __lzo_restrict __restrict__ # define __lzo_restrict __restrict__
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 600) && defined(LZO_CC_SYNTAX_GNUC) #elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 600) && defined(LZO_CC_SYNTAX_GNUC)
# define __lzo_restrict __restrict__ # define __lzo_restrict __restrict__
@ -1504,7 +1504,7 @@ extern "C" {
# define __lzo_restrict # define __lzo_restrict
#endif #endif
#if !defined(__lzo_likely) && !defined(__lzo_unlikely) #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_likely(e) (__builtin_expect(!!(e),1))
# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) # define __lzo_unlikely(e) (__builtin_expect(!!(e),0))
#elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 800) #elif defined(LZO_CC_INTELC) && (__INTEL_COMPILER >= 800)

4
src/3rdparty/minilzo/minilzo.c vendored
View File

@ -1925,7 +1925,7 @@ extern "C" {
# define lzo_uintptr_t unsigned long # define lzo_uintptr_t unsigned long
# elif (LZO_SIZEOF_INT == LZO_SIZEOF_VOID_P) # elif (LZO_SIZEOF_INT == LZO_SIZEOF_VOID_P)
# define lzo_uintptr_t unsigned int # 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 # define lzo_uintptr_t unsigned long long
# else # else
# define lzo_uintptr_t size_t # define lzo_uintptr_t size_t
@ -2481,7 +2481,7 @@ __lzo_init_v2(unsigned v, int s1, int s2, int s3, int s4, int s5,
int r; int r;
#if defined(__LZO_IN_MINILZO) #if defined(__LZO_IN_MINILZO)
#elif (LZO_CC_MSC && ((_MSC_VER) < 700)) #elif defined(LZO_CC_MSC) && ((_MSC_VER) < 700)
#else #else
#define ACC_WANT_ACC_CHK_CH 1 #define ACC_WANT_ACC_CHK_CH 1
#undef ACCCHK_ASSERT #undef ACCCHK_ASSERT