diff --git a/docs/latex/wx/cppconst.tex b/docs/latex/wx/cppconst.tex index 263a443b5e..b3f0fbe711 100644 --- a/docs/latex/wx/cppconst.tex +++ b/docs/latex/wx/cppconst.tex @@ -104,6 +104,7 @@ compiler used. \begin{twocollist}\itemsep=0pt \twocolitem{\_\_ALPHA\_\_}{DEC Alpha architecture} \twocolitem{\_\_INTEL\_\_}{Intel i386 or compatible} +\twocolitem{\_\_IA64\_\_}{Intel 64 bit architecture} \twocolitem{\_\_POWERPC\_\_}{Motorola Power PC} \end{twocollist} diff --git a/include/wx/platform.h b/include/wx/platform.h index bd30bf68f2..7d82a9cef5 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -223,6 +223,35 @@ # endif #endif +/* + Hardware platform detection. + + VC++ defines _M_xxx symbols. + */ +#if defined(_M_IX86) || defined(i386) || defined(__i386) || defined(__i386__) + #ifndef __INTEL__ + #define __INTEL__ + #endif +#endif /* x86 */ + +#if defined(_M_IA64) + #ifndef __IA64__ + #define __IA64__ + #endif +#endif /* ia64 */ + +#if defined(_M_MPPC) || defined(__PPC__) + #ifndef __POWERPC__ + #define __POWERPC__ + #endif +#endif /* alpha */ + +#if defined(_M_ALPHA) || defined(__AXP__) + #ifndef __ALPHA__ + #define __ALPHA__ + #endif +#endif /* alpha */ + /* Include wx/setup.h for the Unix platform defines generated by configure and the library compilation options