bk commit into 4.1 tree (msvensson:1.2288)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2288 05/05/23 18:53:53 msvensson@neptunus.(none) +3 -0
  Build fixes for icc, compile _without_ "-no-gnu"

  ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
    1.16 05/05/23 18:53:50 msvensson@neptunus.(none) +0 -4
    Remove dirent64

  ndb/src/cw/cpcd/Process.cpp
    1.18 05/05/23 18:53:50 msvensson@neptunus.(none) +1 -4
    Remove rlimit64

  include/my_global.h
    1.89 05/05/23 18:53:50 msvensson@neptunus.(none) +1 -1
    icc does not define __ICC when emulating gcc. Use __INTEL_COMPILER to check for icc.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-4.1

--- 1.17/ndb/src/cw/cpcd/Process.cpp	2005-05-09 11:04:33 +02:00
+++ 1.18/ndb/src/cw/cpcd/Process.cpp	2005-05-23 18:53:50 +02:00
@@ -223,11 +223,8 @@
   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"){

--- 1.15/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2005-05-08 22:15:59 +02:00
+++ 1.16/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2005-05-23 18:53:50 +02:00
@@ -799,11 +799,7 @@
       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",

--- 1.88/include/my_global.h	2005-05-09 13:24:57 +02:00
+++ 1.89/include/my_global.h	2005-05-23 18:53:50 +02:00
@@ -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