bk commit into 5.1 tree (joerg:1.2142)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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.2142 06/02/10 12:39:31 joerg@stripped +1 -0
  storage/innobase/include/univ.i  :  Get rid of "extern inline" (part of
innodb-5.0-149/162 snapshots).

  storage/innobase/include/univ.i
    1.45 06/02/10 12:39:25 joerg@stripped +0 -6
    Part of innodb-5.0-149/162 snapshots:
    Avoid breaking --with-debug builds on QNX and other systems
    whose compiler pretends to be GCC 2.
    Outside __WIN__ define UNIV_INLINE as static inline.

# 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:	joerg
# Host:	trift2.
# Root:	/M51/clone-5.1

--- 1.44/storage/innobase/include/univ.i	2005-09-06 09:11:51 +02:00
+++ 1.45/storage/innobase/include/univ.i	2006-02-10 12:39:25 +01:00
@@ -126,13 +126,7 @@
 #ifdef __WIN__
 #define UNIV_INLINE	__inline
 #else
-/* config.h contains the right def for 'inline' for the current compiler */
-#if (__GNUC__ == 2)
-#define UNIV_INLINE  extern inline
-#else
-/* extern inline doesn't work with gcc 3.0.2 */
 #define UNIV_INLINE static inline
-#endif
 #endif
 
 #else