Commit 3ca4caef authored by unknown's avatar unknown
Browse files

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


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
parent 9b8e0274

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -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

ndb/src/cw/cpcd/Process.cpp

+1 −4
Original line number Diff line number Diff line
@@ -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"){

ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp

+0 −4
Original line number Diff line number Diff line
@@ -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",