From d5e29b951b72601b03ea10df3cfd29d795dd6d23 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 18 Jan 2006 14:13:20 +0000 Subject: [PATCH] Applied patch [ 1373215 ] Codewarrior 9 (+?) warning fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wx_cw_cm.h | 14 +++++++++++--- include/wx/wx_cwc.h | 4 ++-- include/wx/wx_cwc_d.h | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h index 27ff0cd2c5..0fdf7f444e 100644 --- a/include/wx/wx_cw_cm.h +++ b/include/wx/wx_cw_cm.h @@ -21,8 +21,8 @@ #define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition -#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200 -#pragma old_argmatch on +#if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200 + #pragma old_argmatch on #endif #if (__MWERKS__ < 0x0900) || macintosh || __MACH__ @@ -58,10 +58,18 @@ #define USE_PRECOMPILED_MAC_HEADERS 0 /*Set to 0 if you don't want to use precompiled MacHeaders*/ #define ACCESSOR_CALLS_ARE_FUNCTIONS 1 #define OPAQUE_TOOLBOX_STRUCTS 1 - #ifdef __MACH__ + + /*CW9 has mbstate_t*/ + #if defined(__MACH__) && __MWERKS__ < 0x3200 typedef int mbstate_t; #define _MBSTATE_T #endif + + /*CW9 has ssize_t*/ + #if defined(__MACH__) && __MWERKS__ >= 0x3200 + #define HAVE_SSIZE_T + #endif + #include // for getting the correct expat includes #define MACOS_CLASSIC diff --git a/include/wx/wx_cwc.h b/include/wx/wx_cwc.h index 18007f921f..0430251bd5 100644 --- a/include/wx/wx_cwc.h +++ b/include/wx/wx_cwc.h @@ -12,8 +12,8 @@ #ifndef _WX_CW__ #define _WX_CW__ -#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200 -#pragma old_argmatch on +#if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200 + #pragma old_argmatch on #endif #if __option(profile) diff --git a/include/wx/wx_cwc_d.h b/include/wx/wx_cwc_d.h index 5ee83883c9..6ad6156616 100644 --- a/include/wx/wx_cwc_d.h +++ b/include/wx/wx_cwc_d.h @@ -12,8 +12,8 @@ #ifndef _WX_CW__ #define _WX_CW__ -#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200 -#pragma old_argmatch on +#if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200 + #pragma old_argmatch on #endif #if __option(profile)