X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a5a83677555023d476401bab5809a1107222c74..5104949d8a39b36bdaade45536453eeb89817959:/src/common/date.cpp diff --git a/src/common/date.cpp b/src/common/date.cpp index 441a8c7e25..bda79ab3a2 100644 --- a/src/common/date.cpp +++ b/src/common/date.cpp @@ -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 (); @@ -481,7 +481,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;