Watford C++ related changes. Unfortunately, the linker now gives a GPF.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -276,6 +276,9 @@ Note (1): setup.h overrides wxUSE_LIBJPEG and sets it to 0, since
|
|||||||
imagjpeg.cpp doesn't compile.
|
imagjpeg.cpp doesn't compile.
|
||||||
Note (2): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
|
Note (2): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
|
||||||
directory. See the notes in that directory.
|
directory. See the notes in that directory.
|
||||||
|
Note (3): makefile compilation seems broken (28/12/99) with a
|
||||||
|
GPF in the linker. Too many object files? Could try switching
|
||||||
|
some options off in setup.h.
|
||||||
|
|
||||||
Metrowerks CodeWarrior compilation
|
Metrowerks CodeWarrior compilation
|
||||||
----------------------------------
|
----------------------------------
|
||||||
|
@@ -97,6 +97,13 @@ class WXDLLEXPORT wxDateSpan;
|
|||||||
|
|
||||||
class WXDLLEXPORT wxDateTime
|
class WXDLLEXPORT wxDateTime
|
||||||
{
|
{
|
||||||
|
private:
|
||||||
|
// invalid wxDateTime object - returned by all functions which return
|
||||||
|
// "wxDateTime &" on failure.
|
||||||
|
// This variable has to be declared at the start of the class,
|
||||||
|
// or some compilers (e.g. Watcom C++) won't like it being used further down.
|
||||||
|
static wxDateTime ms_InvDateTime;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// types
|
// types
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
@@ -904,10 +911,6 @@ private:
|
|||||||
// fixed to 1000
|
// fixed to 1000
|
||||||
static const long TIME_T_FACTOR;
|
static const long TIME_T_FACTOR;
|
||||||
|
|
||||||
// invalid wxDateTime object - returned by all functions which return
|
|
||||||
// "wxDateTime &" on failure
|
|
||||||
static wxDateTime ms_InvDateTime;
|
|
||||||
|
|
||||||
// returns TRUE if we fall in range in which we can use standard ANSI C
|
// returns TRUE if we fall in range in which we can use standard ANSI C
|
||||||
// functions
|
// functions
|
||||||
inline bool IsInStdRange() const;
|
inline bool IsInStdRange() const;
|
||||||
|
@@ -56,9 +56,12 @@
|
|||||||
#endif
|
#endif
|
||||||
#else // no native long long type
|
#else // no native long long type
|
||||||
// both warning and pragma warning are not portable, but at least an
|
// both warning and pragma warning are not portable, but at least an
|
||||||
// unknown pragma should never be an error
|
// unknown pragma should never be an error.
|
||||||
|
// Err, actually, Watcom C++ doesn't like it.
|
||||||
|
#ifndef __WATCOMC__
|
||||||
#pragma warning "Your compiler does not appear to support 64 bit "\
|
#pragma warning "Your compiler does not appear to support 64 bit "\
|
||||||
"integers, using emulation class instead."
|
"integers, using emulation class instead."
|
||||||
|
#endif
|
||||||
|
|
||||||
#define wxUSE_LONGLONG_WX 1
|
#define wxUSE_LONGLONG_WX 1
|
||||||
#endif // compiler
|
#endif // compiler
|
||||||
|
@@ -46,8 +46,8 @@
|
|||||||
|
|
||||||
#include "wx/dialup.h"
|
#include "wx/dialup.h"
|
||||||
|
|
||||||
// Doesn't yet compile under BC++ nor with mingw: no wininet.h
|
// Doesn't yet compile under BC++, mingw, Watcom C++: no wininet.h
|
||||||
#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__)
|
#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__)
|
||||||
|
|
||||||
#include <ras.h>
|
#include <ras.h>
|
||||||
#include <raserror.h>
|
#include <raserror.h>
|
||||||
|
Reference in New Issue
Block a user