On 09/09 14.40, Sunanda Menon wrote:
> Hi ,
> 
> Please review the code changes for 6693315: bump mysql from 5.0.45 to 
> latest 5.0.*  at
> http://cr.opensolaris.org/~sunandam/6693315/ and let me know your 
> comments ASAP.

I just discovered that the inline.patch appears to fail because the
context in the patch file contains the *new* version of the comment.

I enclose a fixed patch file.

-- 
Bjorn Munch                 Sun Microsystems
Trondheim, Norway       http://sun.com/postgresql/
-------------- next part --------------
*** innobase/include/univ.i.orig Mon Aug  4 14:19:15 2008
--- innobase/include/univ.i      Thu Sep 11 17:26:43 2008
***************
*** 55,64 ****
  #define UNIV_CAN_USE_X86_ASSEMBLER
  #endif
  
! /* We only try to do explicit inlining of functions with gcc and
! Microsoft Visual C++ */
  
! #if !defined(__GNUC__) && !defined(__WIN__)
  #undef  UNIV_MUST_NOT_INLINE                  /* Remove compiler warning */
  #define UNIV_MUST_NOT_INLINE
  #endif
--- 55,64 ----
  #define UNIV_CAN_USE_X86_ASSEMBLER
  #endif
  
! /* We only try to do explicit inlining of functions with gcc, 
! Microsoft Visual C++ and Sun Compilers */
  
! #if !defined(__GNUC__) && !defined(__WIN__) && !defined(__SUNWSPRO_C)
  #undef  UNIV_MUST_NOT_INLINE                  /* Remove compiler warning */
  #define UNIV_MUST_NOT_INLINE
  #endif

Reply via email to