* opal already sets __builtin_expect, so don't try to redefine it if it's

already set.  This can annoy compilers that aren't GNUish
* __align is technically a reserved token and IBM XL appears to be doing
  something with it that causes compile badness.  So use a different
  variable name.

refs trac:279

This commit was SVN r11264.

The following Trac tickets were found above:
  Ticket 279 --> https://svn.open-mpi.org/trac/ompi/ticket/279

opal/mca/memory/ptmalloc2/arena.c

@@ -137,7 +137,7 @@ int __malloc_initialized = -1;
 static __malloc_ptr_t (*save_malloc_hook) __MALLOC_P ((size_t __size,
 						       __const __malloc_ptr_t));
 # if !defined _LIBC || !defined USE_TLS || (defined SHARED && !USE___THREAD)
-static __malloc_ptr_t (*save_memalign_hook) __MALLOC_P ((size_t __align,
+static __malloc_ptr_t (*save_memalign_hook) __MALLOC_P ((size_t align,
 							 size_t __size,
 						       __const __malloc_ptr_t));
 # endif

opal/mca/memory/ptmalloc2/malloc.c

@@ -573,8 +573,10 @@ Void_t *(*__morecore)(ptrdiff_t) = __default_morecore;
 
 
 #if !defined _LIBC && (!defined __GNUC__ || __GNUC__<3)
+#ifndef __builtin_expect
 #define __builtin_expect(expr, val) (expr)
 #endif
+#endif
 
 /*
   HAVE_MEMCPY should be defined if you are not otherwise using