From: Vadim Zeitlin Date: Tue, 3 Aug 1999 11:31:47 +0000 (+0000) Subject: LINKAGEMODE moved to defs.h - string.cpp actually compiles now... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d5d63453b173c6419f200001ba451c20f525f9a1?ds=sidebyside LINKAGEMODE moved to defs.h - string.cpp actually compiles now... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/defs.h b/include/wx/defs.h index 15e3598434..e7c77c366c 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -63,7 +63,9 @@ #ifndef __WXPM__ #define __WXPM__ #endif + // Place other OS/2 compiler environment defines here + #define LINKAGEMODE _Optlink #else // Windows #ifndef __WINDOWS__ #define __WINDOWS__ @@ -82,6 +84,11 @@ #endif // compiler #endif // OS +// LINKAGEMODE mode is empty for everyting except OS/2 +#ifndef LINKAGEMODE + #define LINKAGEMODE +#endif // LINKAGEMODE + // suppress some Visual C++ warnings #ifdef __VISUALC__ # pragma warning(disable:4244) // conversion from double to float diff --git a/include/wx/list.h b/include/wx/list.h index 186ad733cf..4960930946 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -29,12 +29,6 @@ #pragma interface "list.h" #endif -#ifdef __WXPM__ -#define LINKAGEMODE _Optlink -#else -#define LINKAGEMODE -#endif - // ----------------------------------------------------------------------------- // headers // -----------------------------------------------------------------------------