From ad05396006ee3655f079bd2a3c57ac0e3e7e8828 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sun, 18 Nov 2001 12:25:12 +0000 Subject: [PATCH] corrections for compilation under Mac OS X removed invalid '#pragma interface' in source files (instead of headers?) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/HelpGen/src/.cvsignore | 5 +++++ utils/HelpGen/src/HelpGenM5.mcp | Bin 0 -> 188867 bytes utils/HelpGen/src/cjparser.cpp | 3 +-- utils/HelpGen/src/ifcontext.cpp | 7 ++++--- utils/HelpGen/src/scriptbinder.cpp | 4 +++- utils/HelpGen/src/sourcepainter.cpp | 7 ++----- utils/HelpGen/src/srcparser.cpp | 7 ++++--- utils/HelpGen/src/wxstlac.h | 20 ++++++++++++-------- utils/HelpGen/src/wxstllst.h | 6 ++++-- utils/HelpGen/src/wxstlvec.h | 4 +++- 10 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 utils/HelpGen/src/.cvsignore create mode 100644 utils/HelpGen/src/HelpGenM5.mcp diff --git a/utils/HelpGen/src/.cvsignore b/utils/HelpGen/src/.cvsignore new file mode 100644 index 0000000000..f581451dd3 --- /dev/null +++ b/utils/HelpGen/src/.cvsignore @@ -0,0 +1,5 @@ +HelpGenM*Data +*Classic?Debug* +*Classic?Release* +*Carbon?Debug* +*Carbon?Release* diff --git a/utils/HelpGen/src/HelpGenM5.mcp b/utils/HelpGen/src/HelpGenM5.mcp new file mode 100644 index 0000000000000000000000000000000000000000..0aba92129288556c8a9224f238de9927d8cdf788 GIT binary patch literal 188867 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 +#ifdef HAVE_MALLOC_H +# include +#endif #include #include "ifcontext.h" diff --git a/utils/HelpGen/src/scriptbinder.cpp b/utils/HelpGen/src/scriptbinder.cpp index 5ef0e7b0bd..cfdc15fbaf 100644 --- a/utils/HelpGen/src/scriptbinder.cpp +++ b/utils/HelpGen/src/scriptbinder.cpp @@ -20,7 +20,9 @@ #include "wx/wx.h" #endif -#include +#ifdef HAVE_MALLOC_H +# include +#endif #include #include diff --git a/utils/HelpGen/src/sourcepainter.cpp b/utils/HelpGen/src/sourcepainter.cpp index 6814b5ffee..4876009358 100644 --- a/utils/HelpGen/src/sourcepainter.cpp +++ b/utils/HelpGen/src/sourcepainter.cpp @@ -21,12 +21,9 @@ #endif #if defined( wxUSE_TEMPLATE_STL ) - - #include +# include #else - - #include "wxstlac.h" - +# include "wxstlac.h" #endif #include "sourcepainter.h" diff --git a/utils/HelpGen/src/srcparser.cpp b/utils/HelpGen/src/srcparser.cpp index 81d84ed431..2875d44040 100644 --- a/utils/HelpGen/src/srcparser.cpp +++ b/utils/HelpGen/src/srcparser.cpp @@ -10,8 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "srcparser.h" -#pragma interface +# pragma implementation "srcparser.h" #endif // For compilers that support precompilation, includes "wx/wx.h". @@ -25,7 +24,9 @@ #include "wx/wx.h" #endif -#include +#ifdef HAVE_MALLOC_H +# include +#endif #include #include "srcparser.h" diff --git a/utils/HelpGen/src/wxstlac.h b/utils/HelpGen/src/wxstlac.h index 9f69f1f26d..f71ef3405d 100644 --- a/utils/HelpGen/src/wxstlac.h +++ b/utils/HelpGen/src/wxstlac.h @@ -17,7 +17,9 @@ #endif #include -#include +#if !defined(__WXMAC__) || defined(__DARWIN__) +# include +#endif #include #include #include @@ -599,15 +601,16 @@ public:\ #define ___WXSTL_COMMA , -#define __DEFINE_MAP(ARG_IS_UNIQUE, KEY_TYPE, VAL_TYPE, FUNCTOR ) __DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\ +#define __DEFINE_MAP(ARG_IS_UNIQUE, KEY_TYPE, VAL_TYPE, FUNCTOR ) \ +__DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\ FUNCTOR,\ __WXSTLMAP_##KEY_TYPE##VAL_TYPE##ARG_IS_UNIQUE, \ struct key_value_pair { KEY_TYPE first ; \ - VAL_TYPE second;\ - key_value_pair() {}\ - key_value_pair( const KEY_TYPE& key ___WXSTL_COMMA const VAL_TYPE& value ) \ - : first(key) ___WXSTL_COMMA second( value ) {} \ - } , \ + VAL_TYPE second;\ + key_value_pair() {}\ + key_value_pair( const KEY_TYPE& key ___WXSTL_COMMA const VAL_TYPE& value ) \ + : first(key) ___WXSTL_COMMA second( value ) {} \ + } , \ KEY_TYPE,\ VAL_TYPE,\ mData.first, mData.second, x.first, x.second, \ @@ -626,7 +629,8 @@ inline insert_result_iterator insert( const value_type& x )\ return result;\ } ) -#define __DEFINE_SET(ARG_IS_UNIQUE, KEY_TYPE, FUNCTOR ) __DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\ +#define __DEFINE_SET(ARG_IS_UNIQUE, KEY_TYPE, FUNCTOR ) \ +__DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\ FUNCTOR,\ __WXSTLSET_##TYPE##ARG_IS_UNIQUE, \ KEY_TYPE,\ diff --git a/utils/HelpGen/src/wxstllst.h b/utils/HelpGen/src/wxstllst.h index 5a1d1bc469..800fd5a91a 100644 --- a/utils/HelpGen/src/wxstllst.h +++ b/utils/HelpGen/src/wxstllst.h @@ -17,7 +17,9 @@ #endif #include -#include +#if !defined(__WXMAC__) || defined(__DARWIN__) +# include +#endif #include #include #include @@ -556,4 +558,4 @@ public:\ \ _WXSTL_LIST_##ELEMENT_CLASS, ELEMENT_CLASS ) -#endif \ No newline at end of file +#endif diff --git a/utils/HelpGen/src/wxstlvec.h b/utils/HelpGen/src/wxstlvec.h index 6658b07559..c7b2daf27c 100644 --- a/utils/HelpGen/src/wxstlvec.h +++ b/utils/HelpGen/src/wxstlvec.h @@ -19,7 +19,9 @@ #include #include // imports memmove() #include -#include +#if !defined(__WXMAC__) || defined(__DARWIN__) +# include +#endif #include #include -- 2.47.2