1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fixes for icc, compile _without_ "-no-gnu"

Browse Source 
include/my_global.h:
  icc does not define __ICC when emulating gcc. Use __INTEL_COMPILER to check for icc.
ndb/src/cw/cpcd/Process.cpp:
  Remove rlimit64
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Remove dirent64
This commit is contained in:
unknown 2005-05-23 18:53:53 +02:00
parent 9b8e02741a
commit 3ca4caef3f
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/my_global.h
View File

@ -44,7 +44,7 @@
#endif /* __CYGWIN__ */
/* Determine when to use "#pragma interface" */
#if !defined(__CYGWIN__) && !defined(__ICC) && defined(__GNUC__) && (__GNUC__ < 3)
#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
#define USE_PRAGMA_INTERFACE
#endif

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

@ -223,11 +223,8 @@ 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"){

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

@ -799,11 +799,7 @@ 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",