mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Portability fixes
This commit is contained in:
parent
6fac59e501
commit
9ad2cd8c45
2 changed files with 1 additions and 2 deletions
|
@ -15,7 +15,6 @@
|
|||
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
||||
MA 02111-1307, USA */
|
||||
|
||||
#define DONT_USE_RAID
|
||||
#include <global.h>
|
||||
#if defined(__WIN__) || defined(_WIN32) || defined(_WIN64)
|
||||
#include <winsock.h>
|
||||
|
|
|
@ -278,7 +278,7 @@ void Log_event::print_timestamp(FILE* file, time_t* ts)
|
|||
ts = &when;
|
||||
}
|
||||
#ifdef MYSQL_SERVER
|
||||
res=localtime_r(ts,&tm_tmp);
|
||||
localtime_r(ts,(res= &tm_tmp));
|
||||
#else
|
||||
res=localtime(ts);
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue