diff options
| author | mskold@mysql.com <> | 2005-05-08 22:16:24 +0200 |
|---|---|---|
| committer | mskold@mysql.com <> | 2005-05-08 22:16:24 +0200 |
| commit | 4b06c68d837a6abd7f043c172d45b71b990a9b27 (patch) | |
| tree | 0c25198637a131b3855bc6e58365ca1aaa902902 /ndb | |
| parent | 89d8290eb3bcf75f260bdf85011e15db44b1fa0e (diff) | |
| download | mariadb-git-4b06c68d837a6abd7f043c172d45b71b990a9b27.tar.gz | |
Fixes to compile with icc
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/cw/cpcd/Process.cpp | 5 | ||||
| -rw-r--r-- | ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ndb/src/cw/cpcd/Process.cpp b/ndb/src/cw/cpcd/Process.cpp index 2509f34e882..b0ebbadb017 100644 --- a/ndb/src/cw/cpcd/Process.cpp +++ b/ndb/src/cw/cpcd/Process.cpp @@ -220,8 +220,11 @@ set_ulimit(const BaseString & pair){ if(!(list[1].trim() == "unlimited")){ value = atoi(list[1].c_str()); } - +#if defined(__INTEL_COMPILER) + struct rlimit64 rlp; +#else struct rlimit rlp; +#endif #define _RLIMIT_FIX(x) { res = getrlimit(x,&rlp); if(!res){ rlp.rlim_cur = value; res = setrlimit(x, &rlp); }} if(list[0].trim() == "c"){ diff --git a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp b/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp index f76440a462a..b3fc6e04d6c 100644 --- a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp +++ b/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp @@ -799,7 +799,11 @@ AsyncFile::rmrfReq(Request * request, char * path, bool removePath){ request->error = errno; return; } +#if defined(__INTEL_COMPILER) + struct dirent64 * dp; +#else struct dirent * dp; +#endif while ((dp = readdir(dirp)) != NULL){ if ((strcmp(".", dp->d_name) != 0) && (strcmp("..", dp->d_name) != 0)) { BaseString::snprintf(path_add, (size_t)path_max_copy, "%s%s", |