mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixes to compile with icc

Browse source
This commit is contained in:
unknown 2005-05-08 22:16:24 +02:00
commit 8b31c677a2
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ndb/src/cw/cpcd/Process.cpp
View file

@ -220,8 +220,11 @@ set_ulimit(const BaseString & pair){
if(!(list[1].trim() == "unlimited")){ if(!(list[1].trim() == "unlimited")){
value = atoi(list[1].c_str()); value = atoi(list[1].c_str());
} }
#if defined(__INTEL_COMPILER)
struct rlimit64 rlp;
#else
struct rlimit rlp; struct rlimit rlp;
#endif
#define _RLIMIT_FIX(x) { res = getrlimit(x,&rlp); if(!res){ rlp.rlim_cur = value; res = setrlimit(x, &rlp); }} #define _RLIMIT_FIX(x) { res = getrlimit(x,&rlp); if(!res){ rlp.rlim_cur = value; res = setrlimit(x, &rlp); }}
if(list[0].trim() == "c"){ if(list[0].trim() == "c"){

4
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
View file

@ -799,7 +799,11 @@ AsyncFile::rmrfReq(Request * request, char * path, bool removePath){
request->error = errno; request->error = errno;
return; return;
} }
#if defined(__INTEL_COMPILER)
struct dirent64 * dp;
#else
struct dirent * dp; struct dirent * dp;
#endif
while ((dp = readdir(dirp)) != NULL){ while ((dp = readdir(dirp)) != NULL){
if ((strcmp(".", dp->d_name) != 0) && (strcmp("..", dp->d_name) != 0)) { if ((strcmp(".", dp->d_name) != 0) && (strcmp("..", dp->d_name) != 0)) {
BaseString::snprintf(path_add, (size_t)path_max_copy, "%s%s", BaseString::snprintf(path_add, (size_t)path_max_copy, "%s%s",