X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=include%2Fffi_common.h;h=26e1394594ffca315a8bc5cd552a3b5d08ebb2d2;hb=8c63892438fbb7ef754e55c60220dd02e7c8fd70;hp=3620a2e162a80291c449afdfd413e9f9c1ee2330;hpb=056e203a7aec4c87c077192ad776b532a3d0305f;p=android-x86%2Fexternal-libffi.git

diff --git a/include/ffi_common.h b/include/ffi_common.h
index 3620a2e..26e1394 100644
--- a/include/ffi_common.h
+++ b/include/ffi_common.h
@@ -1,5 +1,6 @@
 /* -----------------------------------------------------------------------
    ffi_common.h - Copyright (c) 1996  Red Hat, Inc.
+   Copyright (C) 2007 Free Software Foundation, Inc
 
    Common internal definitions and macros. Only necessary for building
    libffi.
@@ -17,8 +18,11 @@ extern "C" {
 /* Do not move this. Some versions of AIX are very picky about where
    this is positioned. */
 #ifdef __GNUC__
-# define alloca __builtin_alloca
+//# define alloca __builtin_alloca  /* ANDROID removed, clashes w/bionic */
+# include <alloca.h>                /* ANDROID added */
+# define MAYBE_UNUSED __attribute__((__unused__))
 #else
+# define MAYBE_UNUSED
 # if HAVE_ALLOCA_H
 #  include <alloca.h>
 # else