Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'FAR redefined' warning fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-20 22:49:23 +00:00
parent 634d3cc8d8
commit f608bc673f
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
include/wx/defs.h
View File

@@ -636,9 +636,9 @@ enum
typedef float wxFloat32 ; typedef float wxFloat32 ;
#if defined( __WXMAC__ ) && defined (__MWERKS__) #if defined( __WXMAC__ ) && defined (__MWERKS__)
typedef short double wxFloat64; typedef short double wxFloat64;
#else #else
typedef double wxFloat64; typedef double wxFloat64;
#endif #endif
#if defined( __WXMAC__ ) && !defined( __POWERPC__ ) #if defined( __WXMAC__ ) && !defined( __POWERPC__ )
@@ -668,30 +668,30 @@ typedef float wxFloat32 ;
#if defined (__MWERKS__) && ( (__MWERKS__ < 0x0900) || macintosh ) #if defined (__MWERKS__) && ( (__MWERKS__ < 0x0900) || macintosh )
// assembler versions for these // assembler versions for these
#ifdef __POWERPC__ #ifdef __POWERPC__
inline wxUint16 wxUINT16_SWAP_ALWAYS( wxUint16 i ) inline wxUint16 wxUINT16_SWAP_ALWAYS( wxUint16 i )
{return (__lhbrx( &i , 0 ) ) ;} {return (__lhbrx( &i , 0 ) ) ;}
inline wxInt16 wxINT16_SWAP_ALWAYS( wxInt16 i ) inline wxInt16 wxINT16_SWAP_ALWAYS( wxInt16 i )
{return (__lhbrx( &i , 0 ) ) ;} {return (__lhbrx( &i , 0 ) ) ;}
inline wxUint32 wxUINT32_SWAP_ALWAYS( wxUint32 i ) inline wxUint32 wxUINT32_SWAP_ALWAYS( wxUint32 i )
{return (__lwbrx( &i , 0 ) ) ;} {return (__lwbrx( &i , 0 ) ) ;}
inline wxInt32 wxINT32_SWAP_ALWAYS( wxInt32 i ) inline wxInt32 wxINT32_SWAP_ALWAYS( wxInt32 i )
{return (__lwbrx( &i , 0 ) ) ;} {return (__lwbrx( &i , 0 ) ) ;}
#else #else
#pragma parameter __D0 wxUINT16_SWAP_ALWAYS(__D0) #pragma parameter __D0 wxUINT16_SWAP_ALWAYS(__D0)
pascal wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value) pascal wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value)
= { 0xE158 }; = { 0xE158 };
#pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
pascal wxInt16 wxUINT16_SWAP_ALWAYS(wxInt16 value)
= { 0xE158 };
#pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0) #pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
pascal wxUint32 wxUINT32_SWAP_ALWAYS(wxUint32 value) pascal wxInt16 wxUINT16_SWAP_ALWAYS(wxInt16 value)
= { 0xE158, 0x4840, 0xE158 }; = { 0xE158 };
#pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0) #pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0)
pascal wxInt32 wxUINT32_SWAP_ALWAYS(wxInt32 value) pascal wxUint32 wxUINT32_SWAP_ALWAYS(wxUint32 value)
= { 0xE158, 0x4840, 0xE158 }; = { 0xE158, 0x4840, 0xE158 };
#pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0)
pascal wxInt32 wxUINT32_SWAP_ALWAYS(wxInt32 value)
= { 0xE158, 0x4840, 0xE158 };
#endif #endif
#else // !MWERKS #else // !MWERKS
@@ -1651,28 +1651,28 @@ typedef enum {
#ifdef __WXMAC__ #ifdef __WXMAC__
typedef WindowPtr WXHWND; typedef WindowPtr WXHWND;
typedef Handle WXHANDLE; typedef Handle WXHANDLE;
typedef CIconHandle WXHICON; typedef CIconHandle WXHICON;
//typedef unsigned long WXHFONT; //typedef unsigned long WXHFONT;
typedef MenuHandle WXHMENU; typedef MenuHandle WXHMENU;
//typedef unsigned long WXHPEN; //typedef unsigned long WXHPEN;
//typedef unsigned long WXHBRUSH; //typedef unsigned long WXHBRUSH;
//typedef unsigned long WXHPALETTE; //typedef unsigned long WXHPALETTE;
typedef CursHandle WXHCURSOR; typedef CursHandle WXHCURSOR;
typedef RgnHandle WXHRGN; typedef RgnHandle WXHRGN;
//typedef unsigned long WXHACCEL; //typedef unsigned long WXHACCEL;
//typedef unsigned long WXHINSTANCE; //typedef unsigned long WXHINSTANCE;
typedef GWorldPtr WXHBITMAP; typedef GWorldPtr WXHBITMAP;
//typedef unsigned long WXHIMAGELIST; //typedef unsigned long WXHIMAGELIST;
//typedef unsigned long WXHGLOBAL; //typedef unsigned long WXHGLOBAL;
typedef GrafPtr WXHDC; typedef GrafPtr WXHDC;
typedef unsigned int WXUINT; typedef unsigned int WXUINT;
typedef unsigned long WXDWORD; typedef unsigned long WXDWORD;
typedef unsigned short WXWORD; typedef unsigned short WXWORD;
//typedef unsigned int WXWPARAM; //typedef unsigned int WXWPARAM;
//typedef long WXLPARAM; //typedef long WXLPARAM;
typedef RGBColor WXCOLORREF; typedef RGBColor WXCOLORREF;
//typedef void * WXRGNDATA; //typedef void * WXRGNDATA;
//typedef void * WXMSG; //typedef void * WXMSG;
//typedef unsigned long WXHCONV; //typedef unsigned long WXHCONV;
@@ -1806,7 +1806,9 @@ typedef WXHWND WXWidget;
#endif #endif
#endif // no FAR #endif // no FAR
#else // Win32 #else // Win32
#define FAR #ifndef FAR
#define FAR
#endif
#endif // Win16/32 #endif // Win16/32
#endif // MSW #endif // MSW
@@ -1874,8 +1876,8 @@ typedef struct _GtkTooltips GtkTooltips;
typedef struct _GtkNotebook GtkNotebook; typedef struct _GtkNotebook GtkNotebook;
typedef struct _GtkNotebookPage GtkNotebookPage; typedef struct _GtkNotebookPage GtkNotebookPage;
typedef struct _GtkAccelGroup GtkAccelGroup; typedef struct _GtkAccelGroup GtkAccelGroup;
typedef struct _GtkItemFactory GtkItemFactory; typedef struct _GtkItemFactory GtkItemFactory;
typedef struct _GtkSelectionData GtkSelectionData; typedef struct _GtkSelectionData GtkSelectionData;
typedef GtkWidget *WXWidget; typedef GtkWidget *WXWidget;
#endif // GTK #endif // GTK