Added test for long long type. (Really trivial, see setup.h: SIZEOF_xxx)

[wxWidgets.git] / src / common / date.cpp

diff --git a/src/common/date.cpp b/src/common/date.cpp
index 441a8c7e253d022f533f056da40074fbbea33a21..2b248eab657d52d41095120fabb7221c2115f5a2 100644 (file)
--- a/src/common/date.cpp
+++ b/src/common/date.cpp
@@ -28,7 +28,7 @@
 
 #include "wx/setup.h"
 
-#if USE_TIMEDATE
+#if wxUSE_TIMEDATE
 
 #include "wx/date.h"
 #include <wx/intl.h>
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
@@ -105,8 +105,8 @@ wxDate::wxDate (const wxString& dat)
 
     char *token = strtok(buf,"/-");
     month = atoi(token);
-    day   = atoi(strtok(NULL,"/-"));
-    year  = atoi(strtok(NULL," "));
+    day   = atoi(strtok((char *) NULL,"/-"));
+    year  = atoi(strtok((char *) NULL," "));
   }
 
   mdy_to_julian ();
@@ -148,8 +148,8 @@ void wxDate::operator = (const wxString& dat)
 
     char *token = strtok(buf,"/-");
     month = atoi(token);
-    day   = atoi(strtok(NULL,"/-"));
-    year  = atoi(strtok(NULL," "));
+    day   = atoi(strtok((char *) NULL,"/-"));
+    year  = atoi(strtok((char *) NULL," "));
   }
 
   mdy_to_julian ();
@@ -159,10 +159,12 @@ void wxDate::operator = (const wxString& dat)
 // Conversion operations
 //////////////////////////////////////////////////////////////
 
+#ifndef __SALFORDC__
 wxDate::operator wxString( void )
 {
   return FormatDate();
 }
+#endif
 
 //////////////////////////////////////////////////////////////
 // Date Arithmetic
@@ -243,32 +245,32 @@ wxDate &wxDate::operator --(int)
 // Date comparison
 //////////////////////////////////////////////////////////////
 
-bool operator <  (const wxDate &dt1, const wxDate &dt2)
+bool WXDLLEXPORT operator <  (const wxDate &dt1, const wxDate &dt2)
 {
        return ( dt1.julian < dt2.julian );
 }
 
-bool operator <= (const wxDate &dt1, const wxDate &dt2)
+bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2)
 {
        return ( (dt1.julian == dt2.julian) || (dt1.julian < dt2.julian) );
 }
 
-bool operator >  (const wxDate &dt1, const wxDate &dt2)
+bool WXDLLEXPORT operator >  (const wxDate &dt1, const wxDate &dt2)
 {
        return ( dt1.julian > dt2.julian );
 }
 
-bool operator >= (const wxDate &dt1, const wxDate &dt2)
+bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2)
 {
        return ( (dt1.julian == dt2.julian) || (dt1.julian > dt2.julian) );
 }
 
-bool operator == (const wxDate &dt1, const wxDate &dt2)
+bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2)
 {
        return ( dt1.julian == dt2.julian );
 }
 
-bool operator != (const wxDate &dt1, const wxDate &dt2)
+bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2)
 {
        return ( dt1.julian != dt2.julian );
 }
@@ -277,7 +279,7 @@ bool operator != (const wxDate &dt1, const wxDate &dt2)
 // Ostream operations
 ////////////////////////////////////////////////////////////////
 
-ostream &operator << (ostream &os, const wxDate &dt)
+ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt)
 {
        return os << (const char *) dt.FormatDate();
 }
@@ -481,7 +483,7 @@ wxDate& wxDate::Set()
 
     mdy_to_julian();
 #else
-    time_t now = time(NULL);
+    time_t now = time((time_t *) NULL);
     struct tm *localTime = localtime(&now);
 
     month = localTime->tm_mon + 1;