mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 01:04:19 +01:00
MDEV-27142 - fix Connect engine reliance on textmode stdio on Windows...
by removing a couple ifdef(_WIN32)
This commit is contained in:
parent
016dd21371
commit
a5dc76a051
2 changed files with 5 additions and 14 deletions
|
@ -23,10 +23,8 @@
|
|||
|
||||
#define ARGS MY_MIN(24,(int)len-i),s+MY_MAX(i-3,0)
|
||||
|
||||
#if defined(_WIN32)
|
||||
#define EL "\r\n"
|
||||
#else
|
||||
#define EL "\n"
|
||||
#define EL "\n"
|
||||
#if !defined(_WIN32)
|
||||
#undef SE_CATCH // Does not work for Linux
|
||||
#endif
|
||||
|
||||
|
|
|
@ -199,23 +199,16 @@ bool TDBMUL::InitFileNames(PGLOBAL g)
|
|||
|
||||
p = filename + strlen(filename) - 1;
|
||||
|
||||
#if !defined(_WIN32)
|
||||
// Data files can be imported from Windows (having CRLF)
|
||||
|
||||
// Data files can have CRLF
|
||||
if (*p == '\n' || *p == '\r') {
|
||||
// is this enough for Unix ???
|
||||
p--; // Eliminate ending CR or LF character
|
||||
|
||||
if (p >= filename)
|
||||
// is this enough for Unix ???
|
||||
if (*p == '\n' || *p == '\r')
|
||||
p--; // Eliminate ending CR or LF character
|
||||
|
||||
} // endif p
|
||||
|
||||
#else
|
||||
if (*p == '\n')
|
||||
p--; // Eliminate ending new-line character
|
||||
#endif
|
||||
} // endif p
|
||||
// Trim rightmost blanks
|
||||
for (; p >= filename && *p == ' '; p--) ;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue